Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Removed some 'behaviour's from the docs

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6874 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit b34b1a89b22b972f299f22264c2781fdeb619aef 1 parent 3c65462
@adrianholovaty adrianholovaty authored
Showing with 7 additions and 7 deletions.
  1. +3 −3 docs/middleware.txt
  2. +4 −4 docs/templates.txt
View
6 docs/middleware.txt
@@ -69,9 +69,9 @@ Adds a few conveniences for perfectionists:
have a valid urlpattern for ``foo.com/bar``, and do have a valid urlpattern
for ``foo.com/bar/``.
- **New in Django development version:** The behaviour of ``APPEND_SLASH`` has
- changed slightly in the development version (it didn't used to check to see
- if the pattern was matched in the URL patterns).
+ **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
+ whether the pattern was matched in the URLconf.
If ``PREPEND_WWW`` is ``True``, URLs that lack a leading "www." will be
redirected to the same URL with a leading "www."
View
8 docs/templates.txt
@@ -565,17 +565,17 @@ autoescape
**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
inside the block.
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
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
-escaping, either by the code that populated the variable, or because it has
+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 had
the ``safe`` or ``escape`` filters applied.
block
Please sign in to comment.
Something went wrong with that request. Please try again.