Merge branch 'master' of github.com:FreeRDP/FreeRDP

diff --git a/channels/smartcard/client/CMakeLists.txt b/channels/smartcard/client/CMakeLists.txt
index 721a0b9..5477d4a 100644 (file)
--- a/channels/smartcard/client/CMakeLists.txt
+++ b/channels/smartcard/client/CMakeLists.txt
@@ -21,7 +21,7 @@ set(${MODULE_PREFIX}_SRCS
        scard_main.c
        scard_operations.c)
 
-include_directories(${PCSC_INCLUDE_DIRS})
+include_directories(${PCSC_INCLUDE_DIR})
 
 add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DeviceServiceEntry")
 

diff --git a/client/X11/xfreerdp.1.xml b/client/X11/xfreerdp.1.xml
index 8627a72..bf7f774 100644 (file)
--- a/client/X11/xfreerdp.1.xml
+++ b/client/X11/xfreerdp.1.xml
@@ -372,10 +372,10 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>--gdi</term>
+        <term>--gdi <replaceable class="parameter">backend</replaceable></term>
         <listitem>
           <para>
-            GDI rendering backend. <replaceable class="parameter">backend</replaceable> can be either sw (software) or hw (hardware).
+            GDI (Graphics Device Interface) rendering backend. <replaceable class="parameter">backend</replaceable> can be either sw (software) or hw (hardware).
           </para>
         </listitem>
       </varlistentry>
@@ -459,10 +459,10 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>--plugin</term>
+        <term>--plugin <replaceable class="parameter">pluginname</replaceable></term>
         <listitem>
           <para>
-            load a plugin
+            load <replaceable class="parameter">pluginname</replaceable>
           </para>
         </listitem>
       </varlistentry>

diff --git a/libfreerdp/utils/args.c b/libfreerdp/utils/args.c
index 64d6b9b..fc97c27 100644 (file)
--- a/libfreerdp/utils/args.c
+++ b/libfreerdp/utils/args.c
@@ -134,7 +134,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
                                "\n"
                                "Usage: %s [file] [options] server:port\n"
                                "  -0: connect to console session\n"
-                               "  -a: set color depth in bit, default is 16\n"
+                               "  -a: set color depth in bits, default is 16\n"
                                "  -c: shell working directory\n"
                                "  -D: hide window decorations\n"
                                "  -T: window title\n"