Updated template docs to reflect [587]

git-svn-id: http://code.djangoproject.com/svn/django/trunk@588 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 11 insertions, 13 deletions

diff --git a/docs/templates.txt b/docs/templates.txt
index 2b8fd88e33..4a5161eae5 100644
--- a/docs/templates.txt
+++ b/docs/templates.txt
@@ -445,22 +445,20 @@ Built-in tag reference
 
     Example::
 
-        {% ifequal user.id_ comment.user_id %}
+        {% ifequal user.id comment.user_id %}
             ...
         {% endifequal %}
 
-    As in the {% if %} tag, an {% else %} clause is optional.
+    As in the ``{% if %}`` tag, an ``{% else %}`` clause is optional.
 
-``ifnotequal``
-    Output the contents of the block if the two arguments do not equal each other.
-
-    Example::
+    The arguments can be hard-coded strings, so the following is valid::
 
-        {% ifnotequal user.id_ comment.user_id %}
+        {% ifequal user.username "adrian" %}
             ...
-        {% endifnotequal %}
+        {% endifequal %}
 
-    As in the {% if %} tag, an {% else %} clause is optional.
+``ifnotequal``
+    Just like ``ifequal``, except it tests that the two arguments are not equal.
 
 ``load``
     Load a custom template tag set.
@@ -523,14 +521,14 @@ Built-in tag reference
 ``ssi``
     Output the contents of a given file into the page.
 
-    Like a simple "include" tag, the ``ssi`` tag includes the contents
-    of another file -- which must be specified using an absolute page --
-    in the current page::
+    Like a simple "include" tag, ``{% ssi %}`` includes the contents of another
+    file -- which must be specified using an absolute path -- in the current
+    page::
 
         {% ssi /home/html/ljworld.com/includes/right_generic.html %}
 
     If the optional "parsed" parameter is given, the contents of the included
-    file are evaluated as template code, with the current context::
+    file are evaluated as template code, within the current context::
 
         {% ssi /home/html/ljworld.com/includes/right_generic.html parsed %}