[Pkg-owncloud-commits] [owncloud-doc] 32/71: Backport #1029, #1031 and #1032 to stable7

[David Prévot]

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

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

commit e155aa0f626babc210900a7a97ceb3797bbdd4a8
Author: RealRancor <Fisch.666 at gmx.de>
Date:   Sun Apr 5 09:40:39 2015 +0200

    Backport #1029, #1031 and #1032 to stable7
---
 admin_manual/configuration/user_auth_ldap.rst     | 1 +
 admin_manual/installation/nginx_configuration.rst | 4 ++++
 user_manual/webinterface.rst                      | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/admin_manual/configuration/user_auth_ldap.rst b/admin_manual/configuration/user_auth_ldap.rst
index b9841a6..c87ce54 100644
--- a/admin_manual/configuration/user_auth_ldap.rst
+++ b/admin_manual/configuration/user_auth_ldap.rst
@@ -21,6 +21,7 @@ The LDAP application supports:
 * Support for primary groups in Active Directory
 * Auto-detection of LDAP attributes such as base DN, email, and the LDAP server 
   port number
+* Read-only access to your LDAP (no edit or delete of users on your LDAP) 
 
 .. Note:: The LDAP app is not compatible with the ``WebDAV user backend`` app. 
    You cannot use both of them at the same time. 
diff --git a/admin_manual/installation/nginx_configuration.rst b/admin_manual/installation/nginx_configuration.rst
index 0f9818c..4851198 100644
--- a/admin_manual/installation/nginx_configuration.rst
+++ b/admin_manual/installation/nginx_configuration.rst
@@ -9,6 +9,10 @@ Nginx Configuration
 -  Make sure your SSL certificates are readable by the server (see `Nginx HTTP 
    SSL Module documentation <http://wiki.nginx.org/HttpSslModule>`_).
 
+ .. note:: The following example assumes that your ownCloud is installed in
+   your webroot. If you're using a subfolder you need to adjust the configuration
+   accordingly.
+
 .. code-block:: python
 
   upstream php-handler {
diff --git a/user_manual/webinterface.rst b/user_manual/webinterface.rst
index 068798d..a5febe9 100644
--- a/user_manual/webinterface.rst
+++ b/user_manual/webinterface.rst
@@ -26,6 +26,9 @@ bar.
 
     **ownCloud login window**
 
+.. note:: Some apps like ``files_encryption`` are disabling the ``remember``
+   checkbox (shown above) on purpose if they are enabled by your administrator. 
+
 2. Enter your valid username and password.
 
    The username and password combination can be those that you set up yourself

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