innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

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

Backport of 8091e8c5c6 from master
This commit is contained in:
Stephane Angel (Twidi) 2015-11-21 14:37:52 +01:00 committed by Tim Graham
parent 7c3ef19978
commit 8f724817f3
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/ref/django-admin.txt
View File

@ -11,20 +11,14 @@ This document outlines all it can do.
``django-admin.py``. ``django-admin.py``.
In addition, ``manage.py`` is automatically created in each Django project. In addition, ``manage.py`` is automatically created in each Django project.
``manage.py`` is a thin wrapper around ``django-admin`` that takes care of ``manage.py`` does the same thing as ``django-admin`` but takes care of a few
several things for you before delegating to ``django-admin``: things for you:
* It puts your project's package on ``sys.path``. * It puts your project's package on ``sys.path``.
* It sets the :envvar:`DJANGO_SETTINGS_MODULE` environment variable so that * It sets the :envvar:`DJANGO_SETTINGS_MODULE` environment variable so that
it points to your project's ``settings.py`` file. 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 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 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 in ``site-packages/django/bin`` within your Python installation. Consider