Index: django/template/defaulttags.py
===================================================================
--- django/template/defaulttags.py	(Revision 5912)
+++ django/template/defaulttags.py	(Arbeitskopie)
@@ -678,14 +678,14 @@
 
     {% if athlete_list and coach_list or cheerleader_list %}
 
-    If you need to combine and and or to do advanced logic, just use
-    nested if tags. For example:
+    If you need to combine ``and`` and ``or`` to do advanced logic, just
+    use nested if tags. For example::
 
-    {% if athlete_list %}
-        {% if coach_list or cheerleader_list %}
-            We have athletes, and either coaches or cheerleaders!
+        {% if athlete_list %}
+            {% if coach_list or cheerleader_list %}
+                We have athletes, and either coaches or cheerleaders!
+            {% endif %}
         {% endif %}
-    {% endif %}
     """
     bits = token.contents.split()
     del bits[0]
Index: django/template/loader_tags.py
===================================================================
--- django/template/loader_tags.py	(Revision 5912)
+++ django/template/loader_tags.py	(Arbeitskopie)
@@ -140,7 +140,7 @@
     This tag may be used in two ways: ``{% extends "base" %}`` (with quotes)
     uses the literal value "base" as the name of the parent template to extend,
     or ``{% extends variable %}`` uses the value of ``variable`` as either the
-    name of the parent template to extend (if it evaluates to a string,) or as
+    name of the parent template to extend (if it evaluates to a string) or as
     the parent tempate itelf (if it evaluates to a Template object).
     """
     bits = token.contents.split()
Index: docs/contributing.txt
===================================================================
--- docs/contributing.txt	(Revision 5912)
+++ docs/contributing.txt	(Arbeitskopie)
@@ -286,7 +286,7 @@
     * Mark all strings for internationalization; see the `i18n documentation`_
       for details.
 
-    * In docstrings, use "action words," like so::
+    * In docstrings, use "action words" like so::
 
           def foo():
               """
Index: docs/templates_python.txt
===================================================================
--- docs/templates_python.txt	(Revision 5912)
+++ docs/templates_python.txt	(Arbeitskopie)
@@ -277,7 +277,7 @@
 
 Django comes with a special ``Context`` class,
 ``django.template.RequestContext``, that acts slightly differently than
-the normal ``django.template.Context``. The first difference is that takes
+the normal ``django.template.Context``. The first difference is that it takes
 an `HttpRequest object`_ as its first argument. For example::
 
     c = RequestContext(request, {