Fixed #25356 -- Removed default_app_config from startapp template.

Also discouraged its use outside the intended use case.

4 files changed, 8 insertions, 7 deletions

diff --git a/docs/intro/tutorial02.txt b/docs/intro/tutorial02.txt
index 0774b2a54e..402b9213aa 100644
--- a/docs/intro/tutorial02.txt
+++ b/docs/intro/tutorial02.txt
@@ -199,14 +199,14 @@ But first we need to tell our project that the ``polls`` app is installed.
     Django installation.
 
 Edit the :file:`mysite/settings.py` file again, and change the
-:setting:`INSTALLED_APPS` setting to include the string ``'polls'``. So it'll
-look like this:
+:setting:`INSTALLED_APPS` setting to include the string
+``'polls.apps.PollsConfig'``. It'll look like this:
 
 .. snippet::
     :filename: mysite/settings.py
 
     INSTALLED_APPS = [
-        'polls',
+        'polls.apps.PollsConfig',
         'django.contrib.admin',
         'django.contrib.auth',
         'django.contrib.contenttypes',
diff --git a/docs/ref/applications.txt b/docs/ref/applications.txt
index 5ca931ad89..eb3cc6fd85 100644
--- a/docs/ref/applications.txt
+++ b/docs/ref/applications.txt
@@ -81,7 +81,9 @@ subclass by default as follows::
 That will cause ``RockNRollConfig`` to be used when :setting:`INSTALLED_APPS`
 just contains ``'rock_n_roll'``. This allows you to make use of
 :class:`~django.apps.AppConfig` features without requiring your users to
-update their :setting:`INSTALLED_APPS` setting.
+update their :setting:`INSTALLED_APPS` setting. Besides this use case, it's
+best to avoid using ``default_app_config`` and instead specify the app config
+class in :setting:`INSTALLED_APPS` as described next.
 
 Of course, you can also tell your users to put
 ``'rock_n_roll.apps.RockNRollConfig'`` in their :setting:`INSTALLED_APPS`
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index ed5ac98947..4a9c78a3db 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1523,7 +1523,7 @@ Default: ``[]`` (Empty list)
 A list of strings designating all applications that are enabled in this
 Django installation. Each string should be a dotted Python path to:
 
-* an application configuration class, or
+* an application configuration class (preferred), or
 * a package containing an application.
 
 :doc:`Learn more about application configurations </ref/applications>`.
diff --git a/docs/releases/1.9.txt b/docs/releases/1.9.txt
index 04b5a6e781..c0b8ed208e 100644
--- a/docs/releases/1.9.txt
+++ b/docs/releases/1.9.txt
@@ -409,8 +409,7 @@ Management Commands
 * The :djadmin:`createcachetable` command now has a ``--dry-run`` flag to
   print out the SQL rather than execute it.
 
-* The :djadmin:`startapp` command creates an ``apps.py`` file and adds
-  ``default_app_config`` in ``__init__.py``.
+* The :djadmin:`startapp` command creates an ``apps.py`` file.
 
 * When using the PostgreSQL backend, the :djadmin:`dbshell` command can connect
   to the database using the password from your settings file (instead of