You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2018/02/02 16:09:23 UTC

[2/3] guacamole-manual git commit: GUACAMOLE-494: Remove documentation for the "basic-user-mapping" property, now removed having been deprecated back in 0.9.10-incubating.

GUACAMOLE-494: Remove documentation for the "basic-user-mapping" property, now removed having been deprecated back in 0.9.10-incubating.


Project: http://git-wip-us.apache.org/repos/asf/guacamole-manual/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-manual/commit/c9a5d48d
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-manual/tree/c9a5d48d
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-manual/diff/c9a5d48d

Branch: refs/heads/master
Commit: c9a5d48d8ccaec94b8775a0f39226cc3207900ef
Parents: db9a8ad
Author: Michael Jumper <mj...@apache.org>
Authored: Thu Feb 1 23:25:03 2018 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Thu Feb 1 23:28:06 2018 -0800

----------------------------------------------------------------------
 src/chapters/configuring.xml | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/guacamole-manual/blob/c9a5d48d/src/chapters/configuring.xml
----------------------------------------------------------------------
diff --git a/src/chapters/configuring.xml b/src/chapters/configuring.xml
index 7c0d026..69fef82 100644
--- a/src/chapters/configuring.xml
+++ b/src/chapters/configuring.xml
@@ -324,16 +324,9 @@ guacd-port:     4822</programlisting>
                 <primary>user-mapping.xml</primary>
             </indexterm>
             <para>The default authentication provider used by Guacamole reads all username,
-                password, and configuration information from a file called the "user mapping". By
-                default, Guacamole will look for this file at
-                    <filename>GUACAMOLE_HOME/user-mapping.xml</filename>, but this can be overridden
-                by specifying the location with the <property>user-mapping</property> property
-                within <filename>guacamole.properties</filename>:</para>
-            <informalexample>
-                <programlisting>user-mapping: <replaceable>/path/to/user-mapping.xml</replaceable></programlisting>
-            </informalexample>
-            <para>An example of a user mapping file is included with Guacamole, and looks something
-                like this:</para>
+                password, and configuration information from a file called the "user mapping"
+                located at <filename>GUACAMOLE_HOME/user-mapping.xml</filename>. An example of a
+                user mapping file is included with Guacamole, and looks something like this:</para>
             <programlisting>&lt;user-mapping>
 	
     &lt;!-- Per-user authentication and config information -->