From 1fdcae9a6a894d7a3047801b1f0f4d7552df5bdc Mon Sep 17 00:00:00 2001
From: David Fort <contact@hardening-consulting.com>
Date: Tue, 21 Jun 2016 15:10:09 +0200
Subject: [PATCH] Add an environment variables section to the man

---
 .gitignore                       |  2 --
 client/X11/.gitignore            |  2 +-
 client/X11/CMakeLists.txt        |  7 +++++--
 client/X11/xfreerdp-envvar.1.xml | 15 +++++++++++++++
 client/X11/xfreerdp.1.xml.in     |  3 +++
 5 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 client/X11/xfreerdp-envvar.1.xml

diff --git a/.gitignore b/.gitignore
index 34ff16e31..27f9b37d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,8 +45,6 @@ compile_commands.json
 docs/api
 client/X11/xfreerdp.1
 client/X11/xfreerdp.1.xml
-client/X11/xfreerdp-channels.1.xml
-client/X11/xfreerdp-examples.1.xml
 
 # Mac OS X
 .DS_Store
diff --git a/client/X11/.gitignore b/client/X11/.gitignore
index de7ef2209..2f903d647 100644
--- a/client/X11/.gitignore
+++ b/client/X11/.gitignore
@@ -1,2 +1,2 @@
-*.xml
+xfreerdp-argument.1.xml
 generate_argument_docbook
diff --git a/client/X11/CMakeLists.txt b/client/X11/CMakeLists.txt
index ddfe49829..3bd5b0a5f 100644
--- a/client/X11/CMakeLists.txt
+++ b/client/X11/CMakeLists.txt
@@ -93,16 +93,19 @@ if(WITH_MANPAGES)
 
 		add_custom_command(OUTPUT xfreerdp.1
 					COMMAND generate_argument_docbook
-					COMMAND ${CMAKE_COMMAND} -E copy 
+					COMMAND ${CMAKE_COMMAND} -E copy
 						${CMAKE_CURRENT_SOURCE_DIR}/xfreerdp-channels.1.xml ${CMAKE_CURRENT_BINARY_DIR}
-					COMMAND ${CMAKE_COMMAND} -E copy 
+					COMMAND ${CMAKE_COMMAND} -E copy
 						${CMAKE_CURRENT_SOURCE_DIR}/xfreerdp-examples.1.xml ${CMAKE_CURRENT_BINARY_DIR}
+					COMMAND ${CMAKE_COMMAND} -E copy
+						${CMAKE_CURRENT_SOURCE_DIR}/xfreerdp-envvar.1.xml ${CMAKE_CURRENT_BINARY_DIR}
 					COMMAND ${XSLTPROC_EXECUTABLE} ${DOCBOOKXSL_DIR}/manpages/docbook.xsl xfreerdp.1.xml
 					WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 					DEPENDS 
 						${CMAKE_CURRENT_BINARY_DIR}/xfreerdp.1.xml 
 						${CMAKE_CURRENT_SOURCE_DIR}/xfreerdp-examples.1.xml 
 						${CMAKE_CURRENT_SOURCE_DIR}/xfreerdp-channels.1.xml 
+						${CMAKE_CURRENT_SOURCE_DIR}/xfreerdp-envvar.1.xml
 						generate_argument_docbook)
 
 		add_custom_target(xfreerdp.manpage ALL
diff --git a/client/X11/xfreerdp-envvar.1.xml b/client/X11/xfreerdp-envvar.1.xml
new file mode 100644
index 000000000..b51653a8e
--- /dev/null
+++ b/client/X11/xfreerdp-envvar.1.xml
@@ -0,0 +1,15 @@
+<refsect1>
+	<title>Environment variables</title>
+
+	<variablelist>
+		<varlistentry>
+			<term>wlog environment variable</term>
+			<listitem>
+				<para>xfreerdp uses wLog as its log facility, you can refer to the
+				corresponding man page (wlog(1)) for more informations. Arguments passed
+				via the <replaceable>/log-level</replaceable> or <replaceable>/log-filters</replaceable>
+				have precedence over the environment variables.</para>
+			</listitem>
+		</varlistentry>
+	</variablelist>
+</refsect1>
\ No newline at end of file
diff --git a/client/X11/xfreerdp.1.xml.in b/client/X11/xfreerdp.1.xml.in
index 4dbb42083..119f7f344 100644
--- a/client/X11/xfreerdp.1.xml.in
+++ b/client/X11/xfreerdp.1.xml.in
@@ -4,6 +4,7 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 	<!ENTITY syntax SYSTEM "xfreerdp-argument.1.xml">
 	<!ENTITY channels SYSTEM "xfreerdp-channels.1.xml">
+	<!ENTITY envvar SYSTEM "xfreerdp-envvar.1.xml">
 	<!ENTITY examples SYSTEM "xfreerdp-examples.1.xml">
 	]
 >
@@ -49,6 +50,8 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 
 	&channels;
 
+	&envvar;
+
 	&examples;
 
 	<refsect1>