summaryrefslogtreecommitdiff
path: root/docs/ref
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:11:22 -0400
commit8ab5db7a3348b7890eae5db20e48f820bf09c81c (patch)
tree0267df1258b08d35bdfa8db76e59986616448f6c /docs/ref
parent9c49e64b66994ff25980d9d0d21ce3599b17cc4b (diff)
[1.5.x] Fixed #20248 - Clarified manage.py vs. django-admin.py
Backport of 8fc68af9c0 from master
Diffstat (limited to 'docs/ref')
-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 6000b7e41e..8caa81180e 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.