mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-24 18:16:19 +00:00
Code Issues 25 Releases Wiki Activity

Various nominal corrections for grammatical consistency, typos, and crossref targets.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14675 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Gabriel Hurley 2010-11-22 06:08:38 +00:00
parent dc334a2ba8
commit d8c471b840
1 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
docs/releases/1.3-alpha-2.txt
View File

@ -19,24 +19,24 @@ What's new in Django 1.3 alpha 2
Further tweaks to the staticfiles app Further tweaks to the staticfiles app
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Django 1.3 ships with a new contrib app ``'django.contrib.staticfiles'`` Django 1.3 ships with a new contrib app :mod:`django.contrib.staticfiles`
to help developers handle the static media files (images, CSS, Javascript, to help developers handle the static media files (images, CSS, JavaScript,
etc.) that are needed to render a complete web page. etc.) that are needed to render a complete web page.
``staticfiles`` ships with the ability to automatically serve static files The :mod:`~django.contrib.staticfiles` app ships with the ability to
during development (if the :setting:`DEBUG` is ``True``) when using the automatically serve static files during development (if the :setting:`DEBUG`
:djadmin:`runserver` management command. Based on feedback from the setting is ``True``) when using the :djadmin:`runserver` management command.
community this release adds two new options to the ``runserver`` command Based on feedback from the community this release adds two new options to the
to modify this behaviour: :djadmin:`runserver` command to modify this behaviour:
* ``--nostatic``: prevents the ``runserver`` command from serving files * ``--nostatic``: prevents the :djadmin:`runserver` command from serving
completely files completely.
* ``--insecure``: enables serving of static files even if stupidly * ``--insecure``: enables serving of static files even if running with
running in with :setting:`DEBUG` set to False :setting:`DEBUG` set to False. (This is **not** recommended!)
See the :doc:`reference documentation of the app </ref/contrib/staticfiles>` See the :doc:`staticfiles reference documentation </ref/contrib/staticfiles>`
for more details or learn how to :doc:`manage static files for more details, or learn :doc:`how to manage static files
</howto/static-files>`. </howto/static-files>`.
Translation comments Translation comments
@ -61,40 +61,39 @@ Backwards-incompatible changes in 1.3 alpha 2
Introduction of STATIC_URL and STATIC_ROOT settings Introduction of STATIC_URL and STATIC_ROOT settings
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The newly introduced :doc:`/ref/contrib/staticfiles` app extends Django's The newly introduced :mod:`~django.contrib.staticfiles` app -- which extends
abilities to handle static app and project files, required the additon of Django's abilities to handle static files for apps and projects -- required the
settings to refer to those files in templates and code, especially in additon of two new settings to refer to those files in templates and code,
contrast to the :setting:`MEDIA_URL` and :setting:`MEDIA_ROOT` settings that especially in contrast to the :setting:`MEDIA_URL` and :setting:`MEDIA_ROOT`
refer to user-uploaded files. settings that refer to user-uploaded files.
Prior to 1.3 alpha 2 these settings were called ``STATICFILES_URL`` and Prior to 1.3 alpha 2 these settings were called ``STATICFILES_URL`` and
``STATICFILES_ROOT`` to follow the naming scheme for app centric settings. ``STATICFILES_ROOT`` to follow the naming scheme for app-centric settings.
Based on feedback from the community it became apparent that those settings Based on feedback from the community it became apparent that those settings
created confusion, especially given the fact handling static files is also created confusion, especially given the fact that handling static files is also
desired outside the use of the optional ``staticfiles`` app. desired outside the use of the optional :mod:`~django.contrib.staticfiles` app.
As a result, we take the followig steps to rectify the issue: As a result, we took the following steps to rectify the issue:
* Two new global settings that will be used by -- **but are not limited * Two new global settings were added that will be used by, **but are not
to** -- the :doc:`staticfiles</ref/contrib/staticfiles>` app: limited to**, the :doc:`staticfiles</ref/contrib/staticfiles>` app:
* :setting:`STATIC_ROOT` (formally ``STATICFILES_ROOT``) * :setting:`STATIC_ROOT` (formally ``STATICFILES_ROOT``)
* :setting:`STATIC_URL` (formally ``STATICFILES_URL``) * :setting:`STATIC_URL` (formally ``STATICFILES_URL``)
* Moving the * The ``django.contrib.staticfiles.templatetags.staticfiles.get_staticfiles_prefix``
``django.contrib.staticfiles.templatetags.staticfiles.get_staticfiles_prefix`` template tag was moved to Django's core (``django.templatetags.static``) and
template tag to the core (``django.templatetags.static``) and renaming renamed to :ttag:`get_static_prefix`.
it to :ttag:`get_static_prefix`.
* Moving the context processor * The ``django.contrib.staticfiles.context_processors.staticfiles``
``django.contrib.staticfiles.context_processors.staticfiles`` to the context processor was moved to Django's core
core (``django.core.context_processors.static``) and renaming it to (``django.core.context_processors.static``) and renamed to
:func:`~django.core.context_processors.static`. :func:`~django.core.context_processors.static`.
* :ref:`form-media-paths` will use :setting:`STATIC_URL` as the prefix * :ref:`form-media-paths` now uses :setting:`STATIC_URL` as the prefix
**if the value is not None**, and falls back to the previously used **if the value is not None**, and falls back to the previously used
:setting:`MEDIA_URL`. :setting:`MEDIA_URL` setting otherwise.
The Django 1.3 roadmap The Django 1.3 roadmap
====================== ======================