mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-04 02:48:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed #14000 - remove versionadded/changed tags for Django 1.0 and 1.1

Browse source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Timo Graham 2010-12-26 00:37:14 +00:00
parent 00c554f89e
commit 2ea93f9327
58 changed files with 49 additions and 591 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/ref/templates/api.txt
View file

@ -459,8 +459,6 @@ See :doc:`/topics/i18n/index` for more.
django.core.context_processors.media
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. versionadded:: 1.0
If :setting:`TEMPLATE_CONTEXT_PROCESSORS` contains this processor, every
``RequestContext`` will contain a variable ``MEDIA_URL``, providing the
value of the :setting:`MEDIA_URL` setting.

40
docs/ref/templates/builtins.txt
View file

@ -19,8 +19,6 @@ Built-in tag reference
autoescape
~~~~~~~~~~
.. versionadded:: 1.0
Control the current auto-escaping behavior. This tag takes either ``on`` or
``off`` as an argument and that determines whether auto-escaping is in effect
inside the block. The block is closed with an ``endautoescape`` ending tag.
@ -60,8 +58,6 @@ Ignore everything between ``{% comment %}`` and ``{% endcomment %}``
csrf_token
~~~~~~~~~~
.. versionadded:: 1.1.2
In the Django 1.1.X series, this is a no-op tag that returns an empty string for
future compatibility purposes. In Django 1.2 and later, it is used for CSRF
protection, as described in the documentation for :doc:`Cross Site Request
@ -72,8 +68,7 @@ Forgeries </ref/contrib/csrf>`.
cycle
~~~~~
.. versionchanged:: 1.0
Cycle among the given strings or variables each time this tag is encountered.
Cycle among the given strings or variables each time this tag is encountered.
Within a loop, cycles among the given strings each time through the
loop::
@ -259,8 +254,6 @@ provided in ``athlete_list``::
You can loop over a list in reverse by using ``{% for obj in list reversed %}``.
.. versionadded:: 1.0
If you need to loop over a list of lists, you can unpack the values
in each sub-list into individual variables. For example, if your context
contains a list of (x,y) coordinates called ``points``, you could use the
@ -298,8 +291,6 @@ The for loop sets a number of variables available within the loop:
for ... empty
^^^^^^^^^^^^^
.. versionadded:: 1.1
The ``for`` tag can take an optional ``{% empty %}`` clause that will be
displayed if the given array is empty or could not be found::
@ -954,8 +945,6 @@ such as this:
The template tag will output the string ``/clients/client/123/``.
.. versionadded:: 1.0
If you're using :ref:`named URL patterns <naming-url-patterns>`, you can
refer to the name of the pattern in the ``url`` tag instead of using the
path to the view.
@ -964,8 +953,6 @@ Note that if the URL you're reversing doesn't exist, you'll get an
:exc:`NoReverseMatch` exception raised, which will cause your site to display an
error page.
.. versionadded:: 1.0
If you'd like to retrieve a URL without displaying it, you can use a slightly
different call::
@ -982,8 +969,6 @@ missing. In practice you'll use this to link to views that are optional::
<a href="{{ the_url }}">Link to optional stuff</a>
{% endif %}
.. versionadded:: 1.1
If you'd like to retrieve a namespaced URL, specify the fully qualified name::
{% url myapp:view-name %}
@ -1054,8 +1039,6 @@ which is rounded up to 88).
with
~~~~
.. versionadded:: 1.0
.. versionchanged:: 1.3
New keyword argument format and multiple variable assignments.
@ -1390,18 +1373,11 @@ applied to the result will only result in one round of escaping being done. So
it is safe to use this function even in auto-escaping environments. If you want
multiple escaping passes to be applied, use the ``force_escape`` filter.
.. versionchanged:: 1.0
Due to auto-escaping, the behavior of this filter has changed slightly.
The replacements are only made once, after
all other filters are applied -- including filters before and after it.
.. templatefilter:: escapejs
escapejs
~~~~~~~~
.. versionadded:: 1.0
Escapes characters for use in JavaScript strings. This does *not* make the
string safe for use in HTML, but does protect you from syntax errors when using
templates to generate JavaScript/JSON.
@ -1445,8 +1421,9 @@ If ``value`` is the list ``['a', 'b', 'c']``, the output will be ``'a'``.
fix_ampersands
~~~~~~~~~~~~~~
.. versionchanged:: 1.0
This is rarely useful as ampersands are now automatically escaped. See escape_ for more information.
..note::
This is rarely useful as ampersands are automatically escaped. See escape_ for more information.
Replaces ampersands with ``&amp;`` entities.
@ -1503,8 +1480,6 @@ with an argument of ``-1``.
force_escape
~~~~~~~~~~~~
.. versionadded:: 1.0
Applies HTML escaping to a string (see the ``escape`` filter for details).
This filter is applied *immediately* and returns a new, escaped string. This
is useful in the rare cases where you need multiple escaping or want to apply
@ -1564,8 +1539,6 @@ If ``value`` is the list ``['a', 'b', 'c']``, the output will be the string
last
~~~~
.. versionadded:: 1.0
Returns the last item in a list.
For example::
@ -2035,9 +2008,6 @@ unordered_list
Recursively takes a self-nested list and returns an HTML unordered list --
WITHOUT opening and closing <ul> tags.
.. versionchanged:: 1.0
The format accepted by ``unordered_list`` has changed to be easier to understand.
The list is assumed to be in the proper format. For example, if ``var`` contains
``['States', ['Kansas', ['Lawrence', 'Topeka'], 'Illinois']]``, then
``{{ var|unordered_list }}`` would return::
@ -2054,7 +2024,7 @@ The list is assumed to be in the proper format. For example, if ``var`` contains
</ul>
</li>
Note: the previous more restrictive and verbose format is still supported:
Note: An older, more restrictive and verbose input format is also supported:
``['States', [['Kansas', [['Lawrence', []], ['Topeka', []]]], ['Illinois', []]]]``,
.. templatefilter:: upper