summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2013-04-12 06:10:26 -0400
committerTim Graham <timograham@gmail.com>2013-04-12 06:10:26 -0400
commit8fc68af9c09f47760080327fb820fe88f02f9bf9 (patch)
tree9919e5a427b753dbad1b91e1507d4c6c085348a8 /docs
parentab686022f8619b57e7f851fb2ce8617583d70d8d (diff)
Fixed #20248 - Clarified manage.py vs. django-admin.py
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/django-admin.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 9c193c86f0..1d3f1b8d1d 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -25,9 +25,10 @@ copy ``django-admin.py`` to a location on your existing path or edit the
Environment...``) to point to its installed location.
Generally, when working on a single Django project, it's easier to use
-``manage.py``. Use ``django-admin.py`` with ``DJANGO_SETTINGS_MODULE``, or the
-``--settings`` command line option, if you need to switch between multiple
-Django settings files.
+``manage.py`` than ``django-admin.py``. If you need to switch between multiple
+Django settings files, use ``django-admin.py`` with
+:envvar:`DJANGO_SETTINGS_MODULE` or the :djadminopt:`--settings` command line
+option.
The command-line examples throughout this document use ``django-admin.py`` to
be consistent, but any example can use ``manage.py`` just as well.