Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Proofread new django-admin 'adminmedia' option from [3811] and [3812]

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3841 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 7cfe56524bbe5233ba3a680a01e8a842f12207f7 1 parent f32318b
@adrianholovaty adrianholovaty authored
View
2  django/core/management.py
@@ -1274,7 +1274,7 @@ def execute_from_command_line(action_mapping=DEFAULT_ACTION_MAPPING, argv=None):
parser.add_option('--verbosity', action='store', dest='verbosity', default='2',
type='choice', choices=['0', '1', '2'],
help='Verbosity level; 0=minimal output, 1=normal output, 2=all output'),
- parser.add_option('--adminmedia', dest='admin_media_path', default='', help='Lets you manually specify the directory to serve admin media from when running the development server.'),
+ parser.add_option('--adminmedia', dest='admin_media_path', default='', help='Specifies the directory from which to serve admin media for runserver.'),
options, args = parser.parse_args(argv[1:])
View
2  django/core/servers/basehttp.py
@@ -594,7 +594,7 @@ class AdminMediaHandler(object):
Use this ONLY LOCALLY, for development! This hasn't been tested for
security and is not super efficient.
"""
- def __init__(self, application, media_dir = None):
+ def __init__(self, application, media_dir=None):
from django.conf import settings
self.application = application
if not media_dir:
View
8 docs/django-admin.txt
@@ -392,10 +392,10 @@ and `2` is verbose output.
Example usage::
django-admin.py manage.py --adminmedia=/tmp/new-admin-style/
-Tell Django where to find the various stylesheets and Javascript files for the
-admin interface when running the development server. Normally these files are
-served out of the Django source tree, but since some designers change these
-files for their site, this option allows you to test against custom versions.
+Tells Django where to find the various CSS and JavaScript files for the admin
+interface when running the development server. Normally these files are served
+out of the Django source tree, but because some designers customize these files
+for their site, this option allows you to test against custom versions.
Extra niceties
==============
Please sign in to comment.
Something went wrong with that request. Please try again.