[1.8.x] Corrected doc'd differences between django-admin and manage.py.

Backport of 8091e8c5c61fb0a6bd15e92bea1f9fdfa21c047f from master

1 files changed, 2 insertions, 8 deletions

diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 18d3e84f3a..4c156e4fb5 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -11,20 +11,14 @@ This document outlines all it can do.
     ``django-admin.py``.
 
 In addition, ``manage.py`` is automatically created in each Django project.
-``manage.py`` is a thin wrapper around ``django-admin`` that takes care of
-several things for you before delegating to ``django-admin``:
+``manage.py`` does the same thing as ``django-admin`` but takes care of a few
+things for you:
 
 * It puts your project's package on ``sys.path``.
 
 * It sets the :envvar:`DJANGO_SETTINGS_MODULE` environment variable so that
   it points to your project's ``settings.py`` file.
 
-* It calls :func:`django.setup()` to initialize various internals of Django.
-
-.. versionadded:: 1.7
-
-    :func:`django.setup()` didn't exist in previous versions of Django.
-
 The ``django-admin`` script should be on your system path if you installed
 Django via its ``setup.py`` utility. If it's not on your path, you can find it
 in ``site-packages/django/bin`` within your Python installation. Consider