You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2017/03/28 17:55:00 UTC
[4/5] incubator-guacamole-manual git commit: GUACAMOLE-101: Move new
parameter documentation to more appropriate location in list of parameters.
GUACAMOLE-101: Move new parameter documentation to more appropriate location in list of parameters.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/commit/d556bac8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/tree/d556bac8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/diff/d556bac8
Branch: refs/heads/master
Commit: d556bac8b3bb81f796ad77240fbcb1ff7b8bddf7
Parents: 840bc80
Author: Nick Couchman <vn...@apache.org>
Authored: Tue Mar 28 13:20:41 2017 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Tue Mar 28 13:20:41 2017 -0400
----------------------------------------------------------------------
src/chapters/ldap-auth.xml | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/d556bac8/src/chapters/ldap-auth.xml
----------------------------------------------------------------------
diff --git a/src/chapters/ldap-auth.xml b/src/chapters/ldap-auth.xml
index ab539a8..7e1fdcd 100644
--- a/src/chapters/ldap-auth.xml
+++ b/src/chapters/ldap-auth.xml
@@ -357,6 +357,15 @@ dn: cn={4}guacConfigGroup,cn=schema,cn=config
</listitem>
</varlistentry>
<varlistentry>
+ <term><property>ldap-user-search-filter</property></term>
+ <listitem>
+ <para>The search filter used to query the LDAP tree for users that
+ can log into and be granted privileges in Guacamole. <emphasis>If
+ this property is omitted the default of "(objectClass=*)" will be used.
+ </emphasis></para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term><property>ldap-config-base-dn</property></term>
<listitem>
<para>The base of the DN for all Guacamole configurations. <emphasis>This
@@ -395,15 +404,6 @@ dn: cn={4}guacConfigGroup,cn=schema,cn=config
aliases.</para>
</listitem>
</varlistentry>
- <varlistentry>
- <term><property>ldap-user-search-filter</property></term>
- <listitem>
- <para>The search filter used to query the LDAP tree for users that
- can log into and be granted privileges in Guacamole. <emphasis>If
- this property is omitted the default of "(objectClass=*)" will be used.
- </emphasis></para>
- </listitem>
- </varlistentry>
</variablelist>
<para>Again, even if the defaults are sufficient for the other properties, <emphasis>you
must still specify the <property>ldap-user-base-dn</property>