summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorRyan Hiebert <ryan@ryanhiebert.com>2015-04-30 10:54:45 -0500
committerTim Graham <timograham@gmail.com>2015-09-07 19:54:32 -0400
commit617eff41acc583a3b0f97bb6bcc7efe096dc4891 (patch)
tree8422b047fd36f1318944a6ea32066da1463e8d5b /docs
parent1743efbe62968e6bbdb183e9508e7370e61f43cb (diff)
Fixed #24857 -- Added "python -m django" entry point.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/django-admin.txt8
-rw-r--r--docs/releases/1.9.txt3
2 files changed, 10 insertions, 1 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 4db73e4244..94b12fe9d7 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -33,7 +33,12 @@ Django settings files, use ``django-admin`` with
option.
The command-line examples throughout this document use ``django-admin`` to
-be consistent, but any example can use ``manage.py`` just as well.
+be consistent, but any example can use ``manage.py`` or ``python -m django``
+just as well.
+
+.. versionadded:: 1.9
+
+ ``python -m django`` was added.
Usage
=====
@@ -42,6 +47,7 @@ Usage
$ django-admin <command> [options]
$ manage.py <command> [options]
+ $ python -m django <command> [options]
``command`` should be one of the commands listed in this document.
``options``, which is optional, should be zero or more of the options available
diff --git a/docs/releases/1.9.txt b/docs/releases/1.9.txt
index c0b8ed208e..f93b403552 100644
--- a/docs/releases/1.9.txt
+++ b/docs/releases/1.9.txt
@@ -415,6 +415,9 @@ Management Commands
to the database using the password from your settings file (instead of
requiring it to be manually entered).
+* The ``django`` package may be run as a script, i.e. ``python -m django``,
+ which will behave the same as ``django-admin``.
+
Migrations
^^^^^^^^^^