diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2007-12-04 06:01:00 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2007-12-04 06:01:00 +0000 |
| commit | b34b1a89b22b972f299f22264c2781fdeb619aef (patch) | |
| tree | 9b049589fff7b94a3331348c5976701623fc1042 /docs | |
| parent | 3c654625f130cfa254eeff6c7093e5cb9dc3119f (diff) | |
Removed some 'behaviour's from the docs
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6874 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/middleware.txt | 6 | ||||
| -rw-r--r-- | docs/templates.txt | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/docs/middleware.txt b/docs/middleware.txt index d2e2f63877..39019caf1e 100644 --- a/docs/middleware.txt +++ b/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." diff --git a/docs/templates.txt b/docs/templates.txt index a32ab27e34..e91d1b3e4c 100644 --- a/docs/templates.txt +++ b/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 |