Browse files

[1.5.x] Fixed #20248 - Clarified manage.py vs. django-admin.py

Backport of 8fc68af from master
  • Loading branch information...
1 parent 9c49e64 commit 8ab5db7a3348b7890eae5db20e48f820bf09c81c @timgraham timgraham committed Apr 12, 2013
Showing with 4 additions and 3 deletions.
  1. +4 −3 docs/ref/django-admin.txt
View
7 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.

0 comments on commit 8ab5db7

Please sign in to comment.