[Pkg-owncloud-commits] [owncloud-doc] 16/44: LDAP: Update doc for Advanced Settings -> Directory

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch dfsg_clean
in repository owncloud-doc.

commit 4aab6bf40709b0ec0dc7acbaef694c541457ea8f
Author: Arthur Schiwon <blizzz at owncloud.com>
Date:   Tue Dec 10 13:38:33 2013 +0100

    LDAP: Update doc for Advanced Settings -> Directory
---
 admin_manual/configuration/auth_ldap.rst           |  37 ++++++++++++---------
 admin_manual/images/ldap-advanced-2-directory.png  | Bin 0 -> 30870 bytes
 ...ap-advanced-settings-directory-settings-oc5.png | Bin 31710 -> 0 bytes
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/admin_manual/configuration/auth_ldap.rst b/admin_manual/configuration/auth_ldap.rst
index 8f5326a..1e5c856 100644
--- a/admin_manual/configuration/auth_ldap.rst
+++ b/admin_manual/configuration/auth_ldap.rst
@@ -285,17 +285,12 @@ Cache Time-To-Live:
 Directory Settings
 ~~~~~~~~~~~~~~~~~~~
 
-.. figure:: ../images/ldap-advanced-settings-directory-settings-oc5.png
+.. figure:: ../images/ldap-advanced-2-directory.png
 
    LDAP Advanced Settings, section Directory Settings
 
 User Display Name Field:
-  The attribute that should be used as display name in ownCloud. Prior to
-  ownCloud 5 it was used as internal user name. This is not the case anymore.
-  It also means that display names are not permanent in ownCloud, i.e. if the
-  attribute value changes in LDAP, it changes in ownCloud too. Display names
-  to not need to be unique, but you rather want to specify a more or less unique
-  attribute here to avoid confusion.
+  The attribute that should be used as display name in ownCloud.
 
   *  Example: *displayName*
 
@@ -310,10 +305,16 @@ Base User Tree:
     | *cn=designers,dc=my-company,dc=com*
 
 User Search Attributes:
-  These attributes are used when a search for users with a search string is
-  done. This happens, for instance, in the share dialogue. By default the user
-  display name attribute as specified above is being used. Multiple attributes
-  can be given, one in each line.
+  These attributes are used when a search for users is done. This happens, for
+  instance, in the share dialogue. By default the user display name attribute as
+  specified above is being used. Multiple attributes can be given, one in each
+  line.
+
+  Beware that if an attribute is not available on a user object, the user will
+  neither be listed (e.g. in the share dialogue) nor be able to login. This also
+  affects the display name attribute as specified above. If you override the
+  default, the display name attribute will not be taken into account, unless you
+  specify it as well.
 
   * Example:
 
@@ -339,10 +340,13 @@ Base Group Tree:
     | *cn=madrid,dc=my-company,dc=com*
 
 Group Search Attributes:
-  These attributes are used when a search for groups with a search string is
-  done. This happens, for instance, in the share dialogue. By default the group
-  display name attribute as specified above is being used. Multiple attributes
-  can be given, one in each line.
+  These attributes are used when a search for groups is done. This happens, for
+  instance, in the share dialogue. By default the group display name attribute
+  as specified above is being used. Multiple attributes can be given, one in
+  each line.
+
+  If you override the default, the group display name attribute will not be
+  taken into account, unless you specify it as well.
 
   * Example:
 
@@ -353,6 +357,9 @@ Group Member association:
   The attribute that is used to indicate group memberships, i.e. the attribute
   used by LDAP groups to refer to their users.
 
+  ownCloud detects the value automatically, you should only change it, if you
+  have a very valid reason and know what you are doing.
+
   * Example: *uniquemember*
 
 Special Attributes
diff --git a/admin_manual/images/ldap-advanced-2-directory.png b/admin_manual/images/ldap-advanced-2-directory.png
new file mode 100644
index 0000000..35837fa
Binary files /dev/null and b/admin_manual/images/ldap-advanced-2-directory.png differ
diff --git a/admin_manual/images/ldap-advanced-settings-directory-settings-oc5.png b/admin_manual/images/ldap-advanced-settings-directory-settings-oc5.png
deleted file mode 100644
index a936758..0000000
Binary files a/admin_manual/images/ldap-advanced-settings-directory-settings-oc5.png and /dev/null differ

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-doc.git