Revert "Fixed #20477: Allowed settings.FORMAT_MODULE_PATH to be a list of modules."

This reverts commit 950b6de16ac2f8135612f2ed5984c090dd8e4dcf.

3 files changed, 5 insertions, 31 deletions

diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 926f0d300e..597e39ab99 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1378,20 +1378,6 @@ like::
                 __init__.py
                 formats.py
 
-.. versionchanged:: 1.8
-
-    You can also set this setting to a list of Python paths, for example::
-
-        FORMAT_MODULE_PATH = [
-            'mysite.formats',
-            'some_app.formats',
-        ]
-
-    When Django searches for a certain format, it will go through all given
-    Python paths until it finds a module that actually defines the given
-    format. This means that formats defined in packages farther up in the list
-    will take precedence over the same formats in packages farther down.
-
 Available formats are :setting:`DATE_FORMAT`, :setting:`TIME_FORMAT`,
 :setting:`DATETIME_FORMAT`, :setting:`YEAR_MONTH_FORMAT`,
 :setting:`MONTH_DAY_FORMAT`, :setting:`SHORT_DATE_FORMAT`,
diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt
index 22d8ca7d20..6b0cb85058 100644
--- a/docs/releases/1.8.txt
+++ b/docs/releases/1.8.txt
@@ -133,10 +133,7 @@ Forms
 Internationalization
 ^^^^^^^^^^^^^^^^^^^^
 
-* :setting:`FORMAT_MODULE_PATH` can now be a list of strings representing
-  module paths. This allows importing several format modules from different
-  reusable apps. It also allows overriding those custom formats in your main
-  Django project.
+* ...
 
 Management Commands
 ^^^^^^^^^^^^^^^^^^^
diff --git a/docs/topics/i18n/formatting.txt b/docs/topics/i18n/formatting.txt
index 94b2eed8ee..04b36e2767 100644
--- a/docs/topics/i18n/formatting.txt
+++ b/docs/topics/i18n/formatting.txt
@@ -154,20 +154,11 @@ Django provides format definitions for many locales, but sometimes you might
 want to create your own, because a format files doesn't exist for your locale,
 or because you want to overwrite some of the values.
 
+To use custom formats, specify the path where you'll place format files first.
+To do that, just set your :setting:`FORMAT_MODULE_PATH` setting to the package
+where format files will exist, for instance::
 
-.. versionchanged:: 1.8
-
-    The ability to specify FORMAT_MODULE_PATH as a list was added. Previously,
-    only a single string value was supported.
-
-To use custom formats, specify the path where you'll place format files
-first. To do that, just set your :setting:`FORMAT_MODULE_PATH` setting to
-the package where format files will exist, for instance::
-
-    FORMAT_MODULE_PATH = [
-        'mysite.formats',
-        'some_app.formats',
-    ]
+    FORMAT_MODULE_PATH = 'mysite.formats'
 
 Files are not placed directly in this directory, but in a directory named as
 the locale, and must be named ``formats.py``.