Ticket #983: django-admin.diff

django/bin/django-admin.py

@@ -1 +1 @@
 #!/usr/bin/env python
 from django.core import management
 from optparse import OptionParser
-import os, sys
+import os, sys, textwrap
 
 ACTION_MAPPING = {
     'adminindex': management.get_admin_index,
@@ -37 +37 @@
     available_actions.sort()
     for a in available_actions:
         func = ACTION_MAPPING[a]
-        usage.append("  %s %s -- %s" % (a, func.args, getattr(func, 'help_doc', func.__doc__)))
+        usage.append("  %s %s" % (a, func.args))
+        usage.extend(textwrap.wrap(getattr(func, 'help_doc', func.__doc__), initial_indent='    ', subsequent_indent='    '))
+        usage.append("")
     return '\n'.join(usage)
 
 class DjangoOptionParser(OptionParser)