From bca6a7f6c0f59449214f88ff8b1d360031a19c5d Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 14 May 2010 11:41:15 +0000 Subject: [PATCH] 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 --- docs/releases/1.2.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/releases/1.2.txt b/docs/releases/1.2.txt index 5938b33dec..d94aefed7e 100644 --- a/docs/releases/1.2.txt +++ b/docs/releases/1.2.txt @@ -62,12 +62,12 @@ should be aware of: :ttag:`if` tag changes ---------------------- -Due to new features in the :ttag:`if` template tag, it no longer accepts 'and', -'or' and 'not' as valid **variable** names. Previously, that worked in some -cases even though these strings were normally treated as keywords. Now, the -keyword status is always enforced, and template code such as ``{% if not %}`` or -``{% if and %}`` will throw a ``TemplateSyntaxError``. Also, ``in`` is a new -keyword and so is not a valid variable name in this tag. +Due to new features in the :ttag:`if` template tag, it no longer +accepts 'and', 'or' and 'not' as valid **variable** names. Previously, +these strings could be used as variable names. Now, the keyword status +is always enforced, and template code such as ``{% if not %}`` or ``{% +if and %}`` will throw a ``TemplateSyntaxError``. Also, ``in`` is a +new keyword and so is not a valid variable name in this tag. ``LazyObject`` -------------- @@ -102,7 +102,7 @@ following changes: 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 multiple databases, and as a result the way you define database settings has changed.