diff --git a/docs/extending_cms/api_references.rst b/docs/extending_cms/api_references.rst
index 8fe36764b9b..bfbdaa512a5 100644
--- a/docs/extending_cms/api_references.rst
+++ b/docs/extending_cms/api_references.rst
@@ -171,6 +171,19 @@ add a text plugin with the content ``'hello world'``. This is done in English::
     add_plugin(placeholder, 'TextPlugin', 'en', body='hello world')
 
 
+*************
+cms.constants
+*************
+
+.. module:: cms.constants
+
+.. data:: TEMPLATE_INHERITANCE_MAGIC
+
+    The token used to identify when a user selects "inherit" as template for a
+    page.
+
+
+
 ***************
 cms.plugin_base
 ***************
diff --git a/docs/upgrade/2.4.rst b/docs/upgrade/2.4.rst
index e26fa8924dd..2e7ebb2f130 100644
--- a/docs/upgrade/2.4.rst
+++ b/docs/upgrade/2.4.rst
@@ -308,6 +308,15 @@ Should be replaced with the new API::
     get_cms_setting('PLACEHOLDER_FRONTEND_EDITING')
 
 
+Added ``cms.constants`` module
+==============================
+
+This release adds the ``cms.constants`` module which will hold generic django
+CMS constant values. Currently it only contains ``TEMPLATE_INHERITANCE_MAGIC``
+which used to live in ``cms.conf.global_settings`` but was moved to the new
+``cms.constants`` module in the settings overhaul mentioned above.
+
+
 ******************************
 Backwards incompatible changes
 ******************************