From e4f4d7a8d1f56fe7d95cea04f917148b8f35dfe6 Mon Sep 17 00:00:00 2001 From: Carla Schroder Date: Wed, 1 Oct 2014 14:37:58 -0700 Subject: [PATCH 1/3] Added warning to use php 5.4 or greater --- admin_manual/configuration/auth_ldap.rst | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/admin_manual/configuration/auth_ldap.rst b/admin_manual/configuration/auth_ldap.rst index 5e72fdfb5..55e1e1f02 100644 --- a/admin_manual/configuration/auth_ldap.rst +++ b/admin_manual/configuration/auth_ldap.rst @@ -1,9 +1,13 @@ User Authentication with LDAP ============================= -ownCloud ships with an LDAP app so that your existing LDAP users may have -access to your ownCloud server without creating separate ownCloud user accounts. -The app supports: +ownCloud ships with an LDAP application so that your existing LDAP users may +have access to your ownCloud server without creating separate ownCloud user +accounts. + +.. Note:: You must have PHP 5.4 or greater to use the LDAP application. + +The LDAP application supports: * LDAP group support * File sharing with ownCloud users and groups From 6e95a130e668428ef48d647e5072d039c3261428 Mon Sep 17 00:00:00 2001 From: Carla Schroder Date: Wed, 1 Oct 2014 14:54:14 -0700 Subject: [PATCH 2/3] A little more clarification --- admin_manual/configuration/auth_ldap.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/admin_manual/configuration/auth_ldap.rst b/admin_manual/configuration/auth_ldap.rst index 55e1e1f02..5c3eff965 100644 --- a/admin_manual/configuration/auth_ldap.rst +++ b/admin_manual/configuration/auth_ldap.rst @@ -5,7 +5,8 @@ ownCloud ships with an LDAP application so that your existing LDAP users may have access to your ownCloud server without creating separate ownCloud user accounts. -.. Note:: You must have PHP 5.4 or greater to use the LDAP application. +.. Note:: For performance reasons you must have PHP 5.4 or greater to use the + LDAP application with more than 500 users. The LDAP application supports: From e26780118e7e2590b7768faf253c469dcd4d4527 Mon Sep 17 00:00:00 2001 From: Carla Schroder Date: Wed, 1 Oct 2014 15:11:15 -0700 Subject: [PATCH 3/3] Refining language for php 5.4 recommendation --- admin_manual/configuration/auth_ldap.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin_manual/configuration/auth_ldap.rst b/admin_manual/configuration/auth_ldap.rst index 5c3eff965..a942208f3 100644 --- a/admin_manual/configuration/auth_ldap.rst +++ b/admin_manual/configuration/auth_ldap.rst @@ -5,8 +5,8 @@ ownCloud ships with an LDAP application so that your existing LDAP users may have access to your ownCloud server without creating separate ownCloud user accounts. -.. Note:: For performance reasons you must have PHP 5.4 or greater to use the - LDAP application with more than 500 users. +.. Note:: For performance reasons, we recommend using PHP 5.4 or greater to use + the LDAP application with more than 500 users. The LDAP application supports: