Merge branch 'stable-3.12'
* stable-3.12:
Skip unloadable changes in ChangesByProjectCache
gr-access-section: Fix bug with deleting permissions in handleAddedPermissionRemoved
gr-textarea: Fix deleting all text on firefox
gr-textarea: Fix deleting text under firefox when selecting all text
Doc: Drop Java 6 related section in ldap.authentication
Add /polygerrit-ui/screenshots/Chromium/failed/ to .gitignore
Release-Notes: skip
Change-Id: I4871d46e7dd9be21d85cef4848584073636b601b
diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt
index 539008d..e73e17b 100644
--- a/Documentation/config-gerrit.txt
+++ b/Documentation/config-gerrit.txt
@@ -4605,9 +4605,7 @@
Defines how Gerrit authenticates with the server. When set to `GSSAPI`
Gerrit will use Kerberos. To use kerberos the
`java.security.auth.login.config` system property must point to a
-login to a JAAS configuration file and, if Java 6 is used, the system
-property `java.security.krb5.conf` must point to the appropriate
-krb5.ini file with references to the KDC.
+login to a JAAS configuration file.
Typical jaas.conf.
@@ -4621,8 +4619,6 @@
};
----
-See Java documentation on how to create the krb5.ini file.
-
Note the `renewTGT` property to make sure the TGT does not expire,
and `useTicketCache` to use the TGT supplied by the operating system. As
the whole point of using GSSAPI is to have passwordless authentication
