From 9677e8937ebf97f4718aded45cd75b7eacd99a9c Mon Sep 17 00:00:00 2001 From: Josh Richards Date: Sat, 8 Jul 2023 11:23:37 -0400 Subject: [PATCH] (admin) user_auth_ldap: add warnings about LDAP quota precedence Addresses documentation TODO items in nextcloud/server#28052 Signed-off-by: Josh Richards --- admin_manual/configuration_user/user_auth_ldap.rst | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/admin_manual/configuration_user/user_auth_ldap.rst b/admin_manual/configuration_user/user_auth_ldap.rst index 045e5bf20..3f24120da 100644 --- a/admin_manual/configuration_user/user_auth_ldap.rst +++ b/admin_manual/configuration_user/user_auth_ldap.rst @@ -436,17 +436,20 @@ Special attributes Quota Field: Nextcloud can read an LDAP attribute and set the user quota according to its value. Specify the attribute here, and it will return human-readable values, - e.g. "2 GB". Any quota set in LDAP overrides quotas set on the Nextcloud user - management page. + e.g. "2 GB". * Example: *NextcloudQuota* +.. warning:: LDAP quota parameters override quota parameters set in the Nextcloud user management page. + Quota Default: - Override Nextcloud default quota for LDAP users who do not have a quota set in - the Quota Field. + Specifies a default quota for LDAP users who do not have a quota set in + the above Quota Field. * Example: *15 GB* +.. warning:: LDAP quota parameters override quota parameters set in the Nextcloud user management page. + Email Field: Set the user's email from their LDAP attribute. Leave it empty for default behavior.