diff --git a/admin_manual/configuration/index.rst b/admin_manual/configuration/index.rst
index e99307acb..563b881f8 100644
--- a/admin_manual/configuration/index.rst
+++ b/admin_manual/configuration/index.rst
@@ -32,6 +32,7 @@ Configuration
    thirdparty_php_configuration
    user_auth_ftp_smb_imap
    user_auth_ldap
+   user_auth_ldap_cleanup
    user_configuration
    user_provisioning_api
    reset_admin_password
\ No newline at end of file
diff --git a/admin_manual/configuration/user_auth_ldap_cleanup.rst b/admin_manual/configuration/user_auth_ldap_cleanup.rst
new file mode 100644
index 000000000..bd820cf73
--- /dev/null
+++ b/admin_manual/configuration/user_auth_ldap_cleanup.rst
@@ -0,0 +1,69 @@
+=================
+LDAP User Cleanup
+=================
+
+LDAP User Cleanup is a new feature in the ``LDAP user and group backend`` 
+application. LDAP User Cleanup is a background process that automatically 
+searches the ownCloud LDAP mappings table, and verifies if the LDAP users are 
+still available. Any users that are not available are marked as ``deleted`` in 
+the ``oc_preferences`` database table. Then you can run a command to display 
+this table, displaying only the users marked as ``deleted``, and then you have 
+the option of removing their data from your ownCloud data directory.
+
+These items are removed upon cleanup:
+
+* Local ownCloud group assignments
+* User preferences (DB table ``oc_preferences``)
+* User's ownCloud home folder
+* User's corresponding entry in ``oc_storages``
+
+There are two prequisites for LDAP User Cleanup to operate:
+
+1. Set ``ldapUserCleanupInterval`` in ``config.php`` to your desired check 
+   interval in minutes. The default is 51 minutes.
+
+2. All configured LDAP connections are enabled and operating correctly. As users 
+   can exist on multiple LDAP servers, you want to be sure that all of your 
+   LDAP servers are available so that a user on a temporarily disconnected LDAP 
+   server is not marked as ``deleted``.
+   
+The background process examines 50 users at a time, and runs at the interval you 
+configured with ``ldapUserCleanupInterval``. For example, if you have 200 LDAP 
+users and your ``ldapUserCleanupInterval`` is 20 minutes, the process will 
+examine the first 50 users, then 20 minutes later the next 50 users, and 20 
+minutes later the next 50, and so on.
+
+This is done with the ``occ`` command, which must be run as your HTTP user. The 
+``occ`` command is in your ownCloud directory, for example 
+``/var/www/owncloud/occ``. To learn more about ``occ``, see :doc:`occ_command`.
+
+There are two commands to use. These examples are for Ubuntu Linux:
+
+1. ``sudo -u www-data occ ldap:show-remnants`` displays a table with all users 
+   that have been marked as deleted, and their LDAP data.
+
+2. ``sudo -u www-data occ user:delete [user]`` removes the user's data from the 
+   ownCloud data directory.
+
+ This example shows what the table of users marked as 
+``deleted`` looks like, and it assumes you have changed to the directory that 
+``occ`` is in::
+
+ $ sudo -u www-data ldap:show-remnants
+ +-----------------+-----------------+------------------+--------------------------------------+
+ | ownCloud name   | Display Name    | LDAP UID         | LDAP DN                              |
+ +-----------------+-----------------+------------------+--------------------------------------+
+ | aaliyah_brown   | aaliyah brown   | aaliyah_brown    | uid=aaliyah_brown,ou=people,dc=com   |
+ | aaliyah_hammes  | aaliyah hammes  | aaliyah_hammes   | uid=aaliyah_hammes,ou=people,dc=com  |
+ | aaliyah_johnston| aaliyah johnston| aaliyah_johnston | uid=aaliyah_johnston,ou=people,dc=com|
+ | aaliyah_kunze   | aaliyah kunze   | aaliyah_kunze    | uid=aaliyah_kunze,ou=people,dc=com   |
+ +-----------------+-----------------+------------------+--------------------------------------+
+
+Then you can run ``sudo -u www-data occ user:delete aaliyah_brown`` to delete 
+user aaliyah_brown. You must use the ownCloud name.
+
+Deleting Local ownCloud Users
+-----------------------------
+
+You may also use ``occ user:delete [user]`` to remove a local ownCloud user; 
+this removes their user account and their data.
diff --git a/admin_manual/index.rst b/admin_manual/index.rst
index db0b9de6f..f22e4869f 100644
--- a/admin_manual/index.rst
+++ b/admin_manual/index.rst
@@ -93,6 +93,7 @@ contains the following topics:
 * :doc:`configuration/thirdparty_php_configuration`
 * :doc:`configuration/user_auth_ftp_smb_imap`
 * :doc:`configuration/user_auth_ldap`
+* :doc:`configuration/user_auth_ldap_cleanup`
 * :doc:`configuration/user_configuration`
 * :doc:`configuration/user_provisioning_api`
 * :doc:`configuration/reset_admin_password`