diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/howto/deployment/wsgi/gunicorn.txt | 2 | ||||
| -rw-r--r-- | docs/man/django-admin.1 | 5 | ||||
| -rw-r--r-- | docs/ref/django-admin.txt | 14 |
3 files changed, 3 insertions, 18 deletions
diff --git a/docs/howto/deployment/wsgi/gunicorn.txt b/docs/howto/deployment/wsgi/gunicorn.txt index ce9e54d4a6..13d4043e37 100644 --- a/docs/howto/deployment/wsgi/gunicorn.txt +++ b/docs/howto/deployment/wsgi/gunicorn.txt @@ -58,7 +58,7 @@ This provides a few Django-specific niceties: * validates installed models * allows an ``--adminmedia`` option for passing in the location of the - admin media files, mimicing the behavior of runserver. + admin media files. See Gunicorn's `deployment documentation`_ for additional tips on starting and maintaining the Gunicorn server. diff --git a/docs/man/django-admin.1 b/docs/man/django-admin.1 index d336da0f7b..4d937b488b 100644 --- a/docs/man/django-admin.1 +++ b/docs/man/django-admin.1 @@ -70,7 +70,7 @@ Runs this project as a FastCGI application. Requires flup. Use .B runfcgi help for help on the KEY=val pairs. .TP -.BI "runserver [" "\-\-noreload" "] [" "\-\-nothreading" "] [" "\-\-nostatic" "] [" "\-\-insecure" "] [" "\-\-ipv6" "] [" "\-\-adminmedia=ADMIN_MEDIA_PATH" "] [" "port|ipaddr:port" "]" +.BI "runserver [" "\-\-noreload" "] [" "\-\-nothreading" "] [" "\-\-nostatic" "] [" "\-\-insecure" "] [" "\-\-ipv6" "] [" "port|ipaddr:port" "]" Starts a lightweight Web server for development. .TP .BI "shell [" "\-\-plain" "]" @@ -169,9 +169,6 @@ Enables IPv6 addresses. .I \-\-verbosity=VERBOSITY Verbosity level: 0=minimal output, 1=normal output, 2=all output. .TP -.I \-\-adminmedia=ADMIN_MEDIA_PATH -Specifies the directory from which to serve admin media when using the development server. -.TP .I \-\-traceback By default, django-admin.py will show a simple error message whenever an error occurs. If you specify this option, django-admin.py will diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index f65f302cdb..63e471df0e 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -655,23 +655,11 @@ You can provide an IPv6 address surrounded by brackets A hostname containing ASCII-only characters can also be used. -.. django-admin-option:: --adminmedia - -Use the ``--adminmedia`` option to tell Django where to find the various CSS -and JavaScript files for the Django admin interface. Normally, the development -server serves these files out of the Django source tree magically, but you'd -want to use this if you made any changes to those files for your own site. - -Example usage:: - - django-admin.py runserver --adminmedia=/tmp/new-admin-style/ - .. versionchanged:: 1.3 If the :doc:`staticfiles</ref/contrib/staticfiles>` contrib app is enabled (default in new projects) the :djadmin:`runserver` command will be overriden -with an own :djadmin:`runserver<staticfiles-runserver>` command which doesn't -have the :djadminopt:`--adminmedia` option due to deprecation. +with an own :djadmin:`runserver<staticfiles-runserver>` command. .. django-admin-option:: --noreload |