summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorLuke Plant <L.Plant.98@cantab.net>2010-03-08 23:25:37 +0000
committerLuke Plant <L.Plant.98@cantab.net>2010-03-08 23:25:37 +0000
commit960af90279081e7a4121736f3f2bc67077f11b31 (patch)
treeb886c53a203dacdd717a30da98e2ca2dc5f04ef4 /docs
parent021ba30ad1d4fffada4f2d43d47a4704bcfca45e (diff)
Fixed #13058 - "smart if" template tag doesn't support "if not in ..." condition
Thanks to ramusus for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12732 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/templates/builtins.txt5
-rw-r--r--docs/releases/1.2.txt6
2 files changed, 8 insertions, 3 deletions
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 8bc4f8e4f6..c613c58107 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -440,6 +440,11 @@ how ``x in y`` will be interpreted::
instance that belongs to the QuerySet.
{% endif %}
+``not in`` operator
+~~~~~~~~~~~~~~~~~~~~
+
+Not contained within. This is the negation of the ``in`` operator.
+
The comparison operators cannot be 'chained' like in Python or in mathematical
notation. For example, instead of using::
diff --git a/docs/releases/1.2.txt b/docs/releases/1.2.txt
index f30e84a77d..24dc483f73 100644
--- a/docs/releases/1.2.txt
+++ b/docs/releases/1.2.txt
@@ -636,9 +636,9 @@ You can now do this:
There's really no reason to use ``{% ifequal %}`` or ``{% ifnotequal %}``
anymore, unless you're the nostalgic type.
-The operators supported are ``==``, ``!=``, ``<``, ``>``, ``<=``, ``>=`` and
-``in``, all of which work like the Python operators, in addition to ``and``,
-``or`` and ``not``, which were already supported.
+The operators supported are ``==``, ``!=``, ``<``, ``>``, ``<=``, ``>=``,
+``in`` and ``not in``, all of which work like the Python operators, in addition
+ to ``and``, ``or`` and ``not``, which were already supported.
Also, filters may now be used in the ``if`` expression. For example: