Removed some 'behaviour's from the docs
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6874 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
3c654625f1
commit
b34b1a89b2
|
@ -69,9 +69,9 @@ Adds a few conveniences for perfectionists:
|
||||||
have a valid urlpattern for ``foo.com/bar``, and do have a valid urlpattern
|
have a valid urlpattern for ``foo.com/bar``, and do have a valid urlpattern
|
||||||
for ``foo.com/bar/``.
|
for ``foo.com/bar/``.
|
||||||
|
|
||||||
**New in Django development version:** The behaviour of ``APPEND_SLASH`` has
|
**New in Django development version:** The behavior of ``APPEND_SLASH`` has
|
||||||
changed slightly in the development version (it didn't used to check to see
|
changed slightly in the development version. It didn't used to check to see
|
||||||
if the pattern was matched in the URL patterns).
|
whether the pattern was matched in the URLconf.
|
||||||
|
|
||||||
If ``PREPEND_WWW`` is ``True``, URLs that lack a leading "www." will be
|
If ``PREPEND_WWW`` is ``True``, URLs that lack a leading "www." will be
|
||||||
redirected to the same URL with a leading "www."
|
redirected to the same URL with a leading "www."
|
||||||
|
|
|
@ -565,17 +565,17 @@ autoescape
|
||||||
|
|
||||||
**New in Django development version**
|
**New in Django development version**
|
||||||
|
|
||||||
Control the current auto-escaping behaviour. This tag takes either ``on`` or
|
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
|
``off`` as an argument and that determines whether auto-escaping is in effect
|
||||||
inside the block.
|
inside the block.
|
||||||
|
|
||||||
When auto-escaping is in effect, all variable content has HTML escaping applied
|
When auto-escaping is in effect, all variable content has HTML escaping applied
|
||||||
to it before placing the result into the output (but after any filters have
|
to it before placing the result into the output (but after any filters have
|
||||||
been applied). This is equivalent to manually applying the ``escape`` filter
|
been applied). This is equivalent to manually applying the ``escape`` filter
|
||||||
attached to each variable.
|
to each variable.
|
||||||
|
|
||||||
The only exceptions are variables that are already marked as 'safe' from
|
The only exceptions are variables that are already marked as "safe" from
|
||||||
escaping, either by the code that populated the variable, or because it has
|
escaping, either by the code that populated the variable, or because it has had
|
||||||
the ``safe`` or ``escape`` filters applied.
|
the ``safe`` or ``escape`` filters applied.
|
||||||
|
|
||||||
block
|
block
|
||||||
|
|
Loading…
Reference in New Issue