From 7dcd023c7abbf5f9ece8219e215f3ae8e1ec4e7e Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Wed, 31 Oct 2012 09:41:00 -0200
Subject: [PATCH 1/2] smartcard: Fix include directory of pcsc headers

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 channels/smartcard/client/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/channels/smartcard/client/CMakeLists.txt b/channels/smartcard/client/CMakeLists.txt
index 721a0b9b0..5477d4a5e 100644
--- 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")
 

From f109360c33f73be4e6bb91a19278995c7f1f82d0 Mon Sep 17 00:00:00 2001
From: Kevin Dalley <kdalley@vmware.com>
Date: Mon, 12 Nov 2012 12:03:39 -0800
Subject: [PATCH 2/2] Improved documentation in xfreerdp.1.xml. Minor change in
 args.c usage statement.

---
 client/X11/xfreerdp.1.xml | 8 ++++----
 libfreerdp/utils/args.c   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/X11/xfreerdp.1.xml b/client/X11/xfreerdp.1.xml
index 8627a72a9..bf7f774e6 100644
--- 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 bfec8171b..89aa152fb 100644
--- a/libfreerdp/utils/args.c
+++ b/libfreerdp/utils/args.c
@@ -123,7 +123,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"