GUACAMOLE-514: Merge documentation for VNC username parameter.
diff --git a/src/chapters/configuring.xml b/src/chapters/configuring.xml
index 828f620..a28e4c3 100644
--- a/src/chapters/configuring.xml
+++ b/src/chapters/configuring.xml
@@ -549,7 +549,8 @@
<title>Authentication</title>
<para>The VNC standard defines only password based authentication. Other
authentication mechanisms exist, but are non-standard or proprietary. Guacamole
- supports only the password method.</para>
+ currently supports both standard password-only based authentication, as well
+ as username and password authentication.</para>
<informaltable frame="all">
<indexterm>
<primary>parameters</primary>
@@ -566,6 +567,16 @@
</thead>
<tbody>
<row>
+ <entry><parameter>username</parameter></entry>
+ <entry>
+ <para><indexterm>
+ <primary>VNC</primary>
+ <secondary>username</secondary>
+ </indexterm>The username to use when attempting
+ authentication, if any. This parameter is optional.</para>
+ </entry>
+ </row>
+ <row>
<entry><parameter>password</parameter></entry>
<entry>
<para><indexterm>
