Move authentication to single chapter

docs/admin/auth.rst

@@ -10,6 +10,77 @@ confirming their email they can contribute.
 
 You can also completely disable registration using :setting:`REGISTRATION_OPEN`.
 
+Authentication
+--------------
+
+By default Weblate uses Django built-in user database. Thanks to this, you can
+also import user database from other Django based projects (see
+:ref:`pootle-migration`).
+
+But Django can be configured to authenticate against other means as well.
+Currently you have to register and confirm your email even when using other
+authentication backend.
+
+Third party authentication
+++++++++++++++++++++++++++
+
+Thanks python-social-auth, Weblate support authentication using many third
+party services such as Facebook, GitHub, Google or Bitbucket.
+
+Please check their documentation for generic configuration instructions:
+
+http://psa.matiasaguirre.net/docs/configuration/django.html
+
+.. note::
+
+    By default, Weblate relies on authentication services provide validated
+    email address, in case some of services you want to use do not support
+    this, please remove ``social.pipeline.social_auth.associate_by_email`` from
+    ``SOCIAL_AUTH_PIPELINE`` settings.
+
+LDAP authentication
++++++++++++++++++++
+
+LDAP authentication can be best achieved using `django-auth-ldap` package. You
+can install it by usual means:
+
+.. code-block:: sh
+
+    # Using PyPI
+    pip install django-auth-ldap
+
+    # Using apt-get
+    apt-get install python-django-auth-ldap
+
+Once you have the package installed, you can hook it to Django authentication:
+
+.. code-block:: python
+
+    # Add LDAP backed, keep Django one if you want to be able to login
+    # even without LDAP for admin account
+    AUTHENTICATION_BACKENDS = (
+        'django_auth_ldap.backend.LDAPBackend',
+        'django.contrib.auth.backends.ModelBackend',
+    )
+
+    # LDAP server address
+    AUTH_LDAP_SERVER_URI = 'ldaps://ldap.example.net'
+
+    # DN to use for authentication
+    AUTH_LDAP_USER_DN_TEMPLATE = 'cn=%(user)s,o=Example'
+    # Depending on your LDAP server, you might use different DN
+    # like:
+    # AUTH_LDAP_USER_DN_TEMPLATE = 'ou=users,dc=example,dc=com'
+
+    # List of attributes to import from LDAP on login
+    AUTH_LDAP_USER_ATTR_MAP = {
+        'first_name': 'givenName',
+        'last_name': 'sn',
+        'email': 'mail',
+    }
+
+.. seealso:: http://pythonhosted.org/django-auth-ldap/
+
 .. _privileges:
 
 Access control

docs/admin/install.rst

@@ -464,78 +464,6 @@ Additionally you will have to adjust :file:`weblate/settings.py`::
 
 .. note:: This is supported since Weblate 1.3.
 
-
-Authentication
---------------
-
-By default Weblate uses Django built-in user database. Thanks to this, you can
-also import user database from other Django based projects (see
-:ref:`pootle-migration`).
-
-But Django can be configured to authenticate against other means as well.
-Currently you have to register and confirm your email even when using other
-authentication backend.
-
-Third party authentication
-++++++++++++++++++++++++++
-
-Thanks python-social-auth, Weblate support authentication using many third
-party services such as Facebook, GitHub, Google or Bitbucket.
-
-Please check their documentation for generic configuration instructions:
-
-http://psa.matiasaguirre.net/docs/configuration/django.html
-
-.. note::
-
-    By default, Weblate relies on authentication services provide validated
-    email address, in case some of services you want to use do not support
-    this, please remove ``social.pipeline.social_auth.associate_by_email`` from
-    ``SOCIAL_AUTH_PIPELINE`` settings.
-
-LDAP authentication
-+++++++++++++++++++
-
-LDAP authentication can be best achieved using `django-auth-ldap` package. You
-can install it by usual means:
-
-.. code-block:: sh
-
-    # Using PyPI
-    pip install django-auth-ldap
-
-    # Using apt-get
-    apt-get install python-django-auth-ldap
-
-Once you have the package installed, you can hook it to Django authentication:
-
-.. code-block:: python
-
-    # Add LDAP backed, keep Django one if you want to be able to login
-    # even without LDAP for admin account
-    AUTHENTICATION_BACKENDS = (
-        'django_auth_ldap.backend.LDAPBackend',
-        'django.contrib.auth.backends.ModelBackend',
-    )
-
-    # LDAP server address
-    AUTH_LDAP_SERVER_URI = 'ldaps://ldap.example.net'
-
-    # DN to use for authentication
-    AUTH_LDAP_USER_DN_TEMPLATE = 'cn=%(user)s,o=Example'
-    # Depending on your LDAP server, you might use different DN
-    # like:
-    # AUTH_LDAP_USER_DN_TEMPLATE = 'ou=users,dc=example,dc=com'
-
-    # List of attributes to import from LDAP on login
-    AUTH_LDAP_USER_ATTR_MAP = {
-        'first_name': 'givenName',
-        'last_name': 'sn',
-        'email': 'mail',
-    }
-
-.. seealso:: http://pythonhosted.org/django-auth-ldap/
-
 .. _appliance:
 
 Prebuilt appliance