Fixed #23814 -- Documented apps refactored out of Django.

4 files changed, 5 insertions, 51 deletions

diff --git a/docs/ref/contrib/formtools/index.txt b/docs/ref/contrib/formtools/index.txt
deleted file mode 100644
index da5e02d4a3..0000000000
--- a/docs/ref/contrib/formtools/index.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-django.contrib.formtools
-========================
-
-A set of high-level abstractions for Django forms (:mod:`django.forms`).
-
-Historically, Django shipped with ``django.contrib.formtools`` -- a collection
-of assorted utilities that are useful for specific form use cases. This code is
-now distributed separately from Django, for easier maintenance and to trim the
-size of Django's codebase. In Django 1.8, importing from
-``django.contrib.formtools`` will no longer work.
-
-The new formtools package is named ``django-formtools``, with a main module
-called ``formtools``. Version 1.0 includes the same two primary features that
-the code included when it shipped with Django: a helper for form previews and a
-form wizard view.
-
-See the `official documentation`_ for more information.
-
-.. _official documentation: http://django-formtools.readthedocs.org/
-
-.. _formtools-how-to-migrate:
-
-How to migrate
---------------
-
-If you've used the old ``django.contrib.formtools`` package follow these
-two easy steps to update your code:
-
-1. Install version 1.0 of the third-party ``django-formtools`` package.
-
-2. Change your app's import statements to reference the new packages.
-
-   For example, change::
-
-       from django.contrib.formtools.wizard.views import WizardView
-
-   to::
-
-       from formtools.wizard.views import WizardView
-
-The code in version 1.0 of the new package is the same (it was copied directly
-from Django), so you don't have to worry about backwards compatibility in terms
-of functionality. Only the imports have changed.
diff --git a/docs/ref/contrib/index.txt b/docs/ref/contrib/index.txt
index 9f7754a7c1..b2b331476e 100644
--- a/docs/ref/contrib/index.txt
+++ b/docs/ref/contrib/index.txt
@@ -26,7 +26,6 @@ those packages have.
    auth
    contenttypes
    flatpages
-   formtools/index
    gis/index
    humanize
    messages
diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt
index 0b411cf729..3746813bfb 100644
--- a/docs/ref/models/fields.txt
+++ b/docs/ref/models/fields.txt
@@ -13,9 +13,11 @@ This document contains all the API references of :class:`Field` including the
 .. seealso::
 
     If the built-in fields don't do the trick, you can try `django-localflavor
-    <https://django-localflavor.readthedocs.org/>`_, which contains assorted
-    pieces of code that are useful for particular countries or cultures. Also,
-    you can easily :doc:`write your own custom model fields
+    <https://github.com/django/django-localflavor>`_ (`documentation
+    <https://django-localflavor.readthedocs.org/>`_), which contains assorted
+    pieces of code that are useful for particular countries and cultures.
+
+    Also, you can easily :doc:`write your own custom model fields
     </howto/custom-model-fields>`.
 
 .. note::
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 5bf53ca76d..0763799651 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1885,11 +1885,7 @@ The secret key is used for:
 * All :doc:`messages </ref/contrib/messages>` if you are using
   :class:`~django.contrib.messages.storage.cookie.CookieStorage` or
   :class:`~django.contrib.messages.storage.fallback.FallbackStorage`.
-* :mod:`Form wizard <formtools.wizard.views>` progress when using
-  cookie storage with
-  :class:`formtools.wizard.views.CookieWizardView`.
 * All :func:`~django.contrib.auth.views.password_reset` tokens.
-* All in progress :mod:`form previews <formtools.preview>`.
 * Any usage of :doc:`cryptographic signing </topics/signing>`, unless a
   different key is provided.