summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/django-admin.txt17
-rw-r--r--docs/releases/1.4.txt8
2 files changed, 19 insertions, 6 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index aa514606e2..41f9bf649d 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -47,11 +47,16 @@ for the given command.
Getting runtime help
--------------------
-.. django-admin-option:: --help
+.. django-admin:: help
-Run ``django-admin.py help`` to display a list of all available commands.
-Run ``django-admin.py help <command>`` to display a description of the
-given command and a list of its available options.
+Run ``django-admin.py help`` to display usage information and a list of the
+commands provided by each application.
+
+Run ``django-admin.py help --commands`` to display a list of all available
+commands.
+
+Run ``django-admin.py help <command>`` to display a description of the given
+command and a list of its available options.
App names
---------
@@ -63,9 +68,9 @@ contains the string ``'mysite.blog'``, the app name is ``blog``.
Determining the version
-----------------------
-.. django-admin-option:: --version
+.. django-admin:: version
-Run ``django-admin.py --version`` to display the current Django version.
+Run ``django-admin.py version`` to display the current Django version.
Examples of output::
diff --git a/docs/releases/1.4.txt b/docs/releases/1.4.txt
index 464ba571a5..e004aefd60 100644
--- a/docs/releases/1.4.txt
+++ b/docs/releases/1.4.txt
@@ -989,6 +989,14 @@ after tests' execution, then you can restore the previous behavior by
subclassing ``DjangoTestRunner`` and overriding its ``teardown_databases()``
method.
+Output of :djadmin:`manage.py help <help>`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+:djadmin:`manage.py help <help>` now groups available commands by application.
+If you depended on its output, for instance if you parsed it, you must update
+your scripts. To obtain the list of all available management commands in a
+script, you can use :djadmin:`manage.py help --commands <help>` instead.
+
Features deprecated in 1.4
==========================