Minor fixes to 1.2 release docs. Thanks to Ramiro Morales for noticing the version number problem.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13262 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2010-05-14 11:41:15 +00:00
parent 9900917d79
commit bca6a7f6c0
1 changed files with 7 additions and 7 deletions

View File

@ -62,12 +62,12 @@ should be aware of:
:ttag:`if` tag changes :ttag:`if` tag changes
---------------------- ----------------------
Due to new features in the :ttag:`if` template tag, it no longer accepts 'and', Due to new features in the :ttag:`if` template tag, it no longer
'or' and 'not' as valid **variable** names. Previously, that worked in some accepts 'and', 'or' and 'not' as valid **variable** names. Previously,
cases even though these strings were normally treated as keywords. Now, the these strings could be used as variable names. Now, the keyword status
keyword status is always enforced, and template code such as ``{% if not %}`` or is always enforced, and template code such as ``{% if not %}`` or ``{%
``{% if and %}`` will throw a ``TemplateSyntaxError``. Also, ``in`` is a new if and %}`` will throw a ``TemplateSyntaxError``. Also, ``in`` is a
keyword and so is not a valid variable name in this tag. new keyword and so is not a valid variable name in this tag.
``LazyObject`` ``LazyObject``
-------------- --------------
@ -102,7 +102,7 @@ following changes:
Specifying databases Specifying databases
-------------------- --------------------
Prior to Django 1.1, Django used a number of settings to control Prior to Django 1.2, Django used a number of settings to control
access to a single database. Django 1.2 introduces support for access to a single database. Django 1.2 introduces support for
multiple databases, and as a result the way you define database multiple databases, and as a result the way you define database
settings has changed. settings has changed.