GUACAMOLE-524: Merge documentation of user attribute tokens.
diff --git a/src/chapters/configuring.xml b/src/chapters/configuring.xml
index e4acadb..f0f86bb 100644
--- a/src/chapters/configuring.xml
+++ b/src/chapters/configuring.xml
@@ -1530,7 +1530,7 @@
translated, and you will need to explicitly choose a different layout in your
connection settings. If your keyboard layout is not supported, please notify the
Guacamole team by <link xmlns:xlink="http://www.w3.org/1999/xlink"
- xlink:href="https://glyptodon.org/jira/">opening an issue in
+ xlink:href="https://issues.apache.org/jira/browse/GUACAMOLE">opening an issue in
JIRA</link>.</para>
<informaltable frame="all">
<indexterm>
@@ -2040,6 +2040,17 @@
</entry>
</row>
<row>
+ <entry><parameter>printer-name</parameter></entry>
+ <entry>
+ <para>The name of the redirected printer device that is passed
+ through to the RDP session. This is the name that the user
+ will see in, for example, the Devices and Printers control
+ panel.</para>
+ <para>If printer redirection is not enabled, this option has no
+ effect.</para>
+ </entry>
+ </row>
+ <row>
<entry><parameter>enable-drive</parameter></entry>
<entry>
<para><indexterm>
@@ -2060,6 +2071,19 @@
</entry>
</row>
<row>
+ <entry><parameter>drive-name</parameter></entry>
+ <entry>
+ <para>The name of the filesystem used when passed through to
+ the RDP session. This is the name that users will see in their
+ Computer/My Computer area along with client name (for example,
+ "Guacamole on Guacamole RDP"), and is also the name of the share
+ when accessing the special <filename>\\tsclient</filename>
+ network location.</para>
+ <para>If file transfer is not enabled, this parameter is
+ ignored.</para>
+ </entry>
+ </row>
+ <row>
<entry><parameter>drive-path</parameter></entry>
<entry>
<para>The directory on the Guacamole server in which transferred
