From 8fc68af9c09f47760080327fb820fe88f02f9bf9 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Fri, 12 Apr 2013 06:10:26 -0400 Subject: [PATCH] Fixed #20248 - Clarified manage.py vs. django-admin.py --- docs/ref/django-admin.txt | 7 ++++--- 1 file 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.