summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-02-07 18:46:29 +0000
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-02-07 18:46:29 +0000
commit175e6d77df526dea1ade94661e487072e7c7cd88 (patch)
tree01c72a224ff47c1f2944612ad46381337d72eda2 /docs/ref
parent09ad6d1b88381497493120c4be882175c11a4bc8 (diff)
Fixed #11745 -- Grouped commands by application in the output of `manage.py help`. Made 'version' consistent with 'help' while I was in the area, and added tests. Thanks Jannis for the feedback and review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17462 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/django-admin.txt17
1 files changed, 11 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::