diff --git a/docs/user/feature-flags.rst b/docs/user/feature-flags.rst
index 0ac3a236f72..df94f9c90ef 100644
--- a/docs/user/feature-flags.rst
+++ b/docs/user/feature-flags.rst
@@ -1,9 +1,10 @@
 Feature Flags
 =============
 
-Read the Docs offers some additional flag settings
-which are disabled by default for every project
-and can only be enabled by `contacting us through our support form`_
+.. **Please don't add more stuff here**. We want to move user-facing options to the config file.
+
+Read the Docs offers a few additional settings that are otherwise disabled by default.
+These specific settings are called *feature flags* and can only be enabled by `contacting us through our support form`_
 or reaching out to the administrator of your service.
 
 .. _contacting us through our support form: https://docs.readthedocs.io/en/stable/support.html
diff --git a/docs/user/index.rst b/docs/user/index.rst
index f16e19b4710..71dc2a30c1e 100644
--- a/docs/user/index.rst
+++ b/docs/user/index.rst
@@ -151,7 +151,6 @@ and some of the core features of Read the Docs.
    :hidden:
    :caption: Features
 
-   /features
    /config-file/index
    /integrations
    /versions
diff --git a/docs/user/reference/features.rst b/docs/user/reference/features.rst
index 448bd96454a..2eeff5a1670 100644
--- a/docs/user/reference/features.rst
+++ b/docs/user/reference/features.rst
@@ -3,9 +3,17 @@ Features
 ========
 
 
+.. The TOC here will be refactored once we reorganize the files in docs/user/.
+.. Probably, all feature reference should be in this directory!
+.. In upcoming work, redirects will be added for old URL destinations.
+.. In fact, this whole page will become a proper index page with more explanation of what sort of reference can
+.. be found.
+
 .. toctree::
    :maxdepth: 1
 
+   ../features
    analytics
+   /feature-flags
    /server-side-search/index
    /badges