queryset-refactor: Merged from trunk up to [6623].

git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@6637 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 10 insertions, 7 deletions

diff --git a/docs/django-admin.txt b/docs/django-admin.txt
index f098dfa988..e751a7b3d9 100644
--- a/docs/django-admin.txt
+++ b/docs/django-admin.txt
@@ -741,22 +741,25 @@ Customized actions
 
 **New in Django development version**
 
-If you want to add an action of your own to ``manage.py``, you can.
-Simply add a ``management/commands`` directory to your application.
-Each python module in that directory will be discovered and registered as
+Applications can register their own actions with ``manage.py``. For example,
+you might want to add a ``manage.py`` action for a Django app that you're
+distributing.
+
+To do this, just add a ``management/commands`` directory to your application.
+Each Python module in that directory will be auto-discovered and registered as
 a command that can be executed as an action when you run ``manage.py``::
 
-    /fancy_blog
+    blog/
         __init__.py
         models.py
-        /management
+        management/
             __init__.py
-            /commands
+            commands/
                 __init__.py
                 explode.py
         views.py
         
-In this example, ``explode`` command will be made available to any project
+In this example, the ``explode`` command will be made available to any project
 that includes the ``fancy_blog`` application in ``settings.INSTALLED_APPS``.
 
 The ``explode.py`` module has only one requirement -- it must define a class