diff options
| author | Jannis Leidel <jannis@leidel.info> | 2010-11-17 15:36:26 +0000 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2010-11-17 15:36:26 +0000 |
| commit | 33d8fcde8a317184a627492f008a4eab9333ed88 (patch) | |
| tree | 7c877854327c83aefdfaf00e727d26bd766e519e /docs/man | |
| parent | 9b45f6cd5444423693715cc2a04d91a0de75060b (diff) | |
Fixed #14693, #14709 -- Backwards incompatible change to rectify the confusion around the STATICFILES_URL and STATICFILES_ROOT settings.
* Two new global settings that will be used by -- **but are not limited to** -- the staticfiles app: STATIC_ROOT and STATIC_URL.
* Moving the 'django.contrib.staticfiles.templatetags.staticfiles' template tag to the core ('django.templatetags.static') and renaming it to 'get_static_prefix'.
* Moving the context processor 'django.contrib.staticfiles.context_processors.staticfiles' to the core ('django.core.context_processors.static') and renaming it to 'static'.
* Paths in media definitions will use STATIC_URL as the prefix if the value is not None, and falls back to the previously used MEDIA_URL.
Thanks again to the community for constructive criticism and Carl and Russ for sanity-inducing discussions on IRC.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14592 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/man')
| -rw-r--r-- | docs/man/django-admin.1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/man/django-admin.1 b/docs/man/django-admin.1 index 2197af6650..f9b530a77e 100644 --- a/docs/man/django-admin.1 +++ b/docs/man/django-admin.1 @@ -165,7 +165,7 @@ Do not prompt the user for input. Disable the development server's auto\-reloader. .TP .I \-\-nostatic -Disable automatic serving of static files from STATICFILES_URL. +Disable automatic serving of static files from STATIC_URL. .TP .I \-\-insecure Enables serving of static files even if DEBUG is False. |