django-cms
diff --git a/‎cms/tests/test_placeholder.py
Lines changed: 3 additions & 3 deletions b/‎cms/tests/test_placeholder.py
Lines changed: 3 additions & 3 deletions
diff --git a/‎cms/tests/test_rendering.py
Lines changed: 0 additions & 1 deletion b/‎cms/tests/test_rendering.py
Lines changed: 0 additions & 1 deletion
diff --git a/‎docs/reference/configuration.rst
Lines changed: 1 addition & 10 deletions b/‎docs/reference/configuration.rst
Lines changed: 1 addition & 10 deletions
@@ -457,7 +457,7 @@ def test_get_placeholder_conf(self):
             'main': {
                 'name': 'main content',
                 'plugins': ['TextPlugin', 'LinkPlugin'],
-                'language_fallback': False,
+                'require_parent': False,
             },
             'layout/home.html main': {
                 'name': u'main content with FilerImagePlugin and limit',
@@ -492,8 +492,8 @@ def test_get_placeholder_conf(self):
             returned = get_placeholder_conf('excluded_plugins', 'main', 'layout/other.html')
             self.assertEqual(returned, TEST_CONF['layout/other.html main']['excluded_plugins'])
             # test grandparent inherited value
-            returned = get_placeholder_conf('language_fallback', 'main', 'layout/other.html')
-            self.assertEqual(returned, TEST_CONF['main']['language_fallback'])
+            returned = get_placeholder_conf('require_parent', 'main', 'layout/other.html')
+            self.assertEqual(returned, TEST_CONF['main']['require_parent'])
             # test generic configuration
             returned = get_placeholder_conf('plugins', 'something')
             self.assertEqual(returned, TEST_CONF[None]['plugins'])
 
@@ -668,7 +668,6 @@ def test_inherit_placeholder_override(self):
         r = self.render(self.test_page5)
         self.assertEqual(r, u'|' + self.test_data5['text_main'] + '|' + self.test_data5['text_sub'])
 
-    @override_settings(CMS_PLACEHOLDER_CONF={None: {'language_fallback': False}})
     def test_inherit_placeholder_queries(self):
         with self.assertNumQueries(FuzzyInt(6,8)):
             r = self.render(self.test_page2)
 
@@ -196,7 +196,6 @@ Example::
             'text_only_plugins': ['LinkPlugin'],
             'extra_context': {"width":640},
             'name': gettext("Content"),
-            'language_fallback': True,
             'child_classes': {
                 'TextPlugin': ['PicturePlugin', 'LinkPlugin'],
             },
@@ -280,11 +279,6 @@ matches; if the same configuration is retrieved for the ``content`` placeholder
     this placeholder regardless of type (takes precedence over the
     type-specific limits).
 
-``language_fallback``
-    When ``True``, if the placeholder has no plugin for the current language
-    it falls back to the fallback languages as specified in :setting:`CMS_LANGUAGES`.
-    Defaults to ``True`` since version 3.1.
-
 ``plugin_modules``
     A dictionary of plugins and custom module names to group plugin in the
     toolbar UI.
@@ -522,10 +516,7 @@ will redirect to the URL of the same page in the fallback language. If
 ``False``, the content will be displayed in the fallback language, but there
 will be no redirect.
 
-Note that this applies to the fallback behaviour of *pages*. Starting for 3.1 *placeholders*
-**will** default to the same behaviour. If you do not want a placeholder to follow a page's
-fallback behaviour, you must set its ``language_fallback`` to ``False``
-in :setting:`CMS_PLACEHOLDER_CONF`, above.
+Note that this applies to the fallback behaviour of *pages*.
 
 type
     Boolean