Merge "doc: Document necessity of using 'http.saveCookies'"
diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt
index e73e17b..a603c42 100644
--- a/Documentation/config-gerrit.txt
+++ b/Documentation/config-gerrit.txt
@@ -654,9 +654,10 @@
+
When gitBasicAuthPolicy is set to `LDAP` or `HTTP_LDAP` and the user
is authenticating with the LDAP username/password, the Git client config
-needs to have `http.cookieFile` set to a local file, otherwise every
-single call would trigger a full LDAP authentication and groups resolution
-which could introduce a noticeable latency on the overall execution
+needs to have `http.cookieFile` set to the local file and `http.saveCookies` set
+to `true`, so that HTTP session cookies can be read and saved. Otherwise
+every single call would trigger a full LDAP authentication and groups
+resolution which could introduce a noticeable latency on the overall execution
and produce unwanted load to the LDAP server.
[[auth.maxAuthTokenLifetime]]auth.maxAuthTokenLifetime::
diff --git a/Documentation/user-upload.txt b/Documentation/user-upload.txt
index 5645895..415d27c 100644
--- a/Documentation/user-upload.txt
+++ b/Documentation/user-upload.txt
@@ -33,9 +33,10 @@
When gitBasicAuthPolicy is set to `LDAP` or `HTTP_LDAP` and the user
is authenticating with the LDAP username/password, the Git client config
-needs to have `http.cookieFile` set to a local file, otherwise every
-single call would trigger a full LDAP authentication and groups resolution
-which could introduce a noticeable latency on the overall execution
+needs to have `http.cookieFile` set to the local file and `http.saveCookies` set
+to `true`, so that HTTP session cookies can be read and saved. Otherwise
+every single call would trigger a full LDAP authentication and groups
+resolution which could introduce a noticeable latency on the overall execution
and produce unwanted load to the LDAP server.
When gitBasicAuthPolicy is not `LDAP`, the user's HTTP credentials can
