diff --git a/doc/source/admin/endpoint-filtering.rst b/doc/source/admin/endpoint-filtering.rst
new file mode 100644
index 0000000000..900eb1e3c8
--- /dev/null
+++ b/doc/source/admin/endpoint-filtering.rst
@@ -0,0 +1,25 @@
+Endpoint Filtering
+==================
+
+Endpoint Filtering enables creation of ad-hoc catalogs for each project-scoped
+token request.
+
+Configure the endpoint filter catalog driver in the ``[catalog]`` section.
+For example:
+
+.. code-block:: ini
+
+    [catalog]
+    driver = catalog_sql
+
+In the ``[endpoint_filter]`` section, set ``return_all_endpoints_if_no_filter``
+to ``False`` to return an empty catalog if no associations are made.
+For example:
+
+.. code-block:: ini
+
+    [endpoint_filter]
+    return_all_endpoints_if_no_filter = False
+
+See `API Specification for Endpoint Filtering <https://developer.openstack.org/
+api-ref/identity/v3-ext/#os-ep-filter-api>`_ for the details of API definition.
diff --git a/doc/source/admin/index.rst b/doc/source/admin/index.rst
index 56e9e05fa3..011dceca67 100644
--- a/doc/source/admin/index.rst
+++ b/doc/source/admin/index.rst
@@ -39,3 +39,4 @@ command-line client.
    token-provider.rst
    federated-identity.rst
    identity-credential-encryption.rst
+   endpoint-filtering.rst
diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
index a77e9532c3..e77ad1a6ec 100644
--- a/doc/source/configuration.rst
+++ b/doc/source/configuration.rst
@@ -368,32 +368,6 @@ The value of ``template_file`` is expected to be an absolute path to your
 service catalog configuration. An example ``template_file`` is included in
 keystone, however you should create your own to reflect your deployment.
 
-Endpoint Filtering
-==================
-
-Endpoint Filtering enables creation of ad-hoc catalogs for each project-scoped
-token request.
-
-Configure the endpoint filter catalog driver in the ``[catalog]`` section.
-For example:
-
-.. code-block:: ini
-
-    [catalog]
-    driver = catalog_sql
-
-In the ``[endpoint_filter]`` section, set ``return_all_endpoints_if_no_filter``
-to ``False`` to return an empty catalog if no associations are made.
-For example:
-
-.. code-block:: ini
-
-    [endpoint_filter]
-    return_all_endpoints_if_no_filter = False
-
-See `API Specification for Endpoint Filtering <https://developer.openstack.org/
-api-ref/identity/v3-ext/#os-ep-filter-api>`_ for the details of API definition.
-
 Endpoint Policy
 ===============