Ticket #5187: minor-doc-fixes.diff

django/template/defaulttags.py

@@ -678 +678 @@
-
-    {% if athlete_list and coach_list or cheerleader_list %}
-
-and and or to do advanced logic, just use
-nested if tags. For example
+``and`` and ``or`` to do advanced logic, just
+use nested if tags. For example:
-
-
-
-
+
+
+
+
-        {% endif %}
-    {% endif %}
-    """
-    bits = token.contents.split()
-    del bits[0]

django/template/loader_tags.py

@@ -140 +140 @@
-    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
-,
+
-    the parent tempate itelf (if it evaluates to a Template object).
-    """
-    bits = token.contents.split()

docs/contributing.txt

@@ -286 +286 @@
-    * Mark all strings for internationalization; see the `i18n documentation`_
-      for details.
-
-,
+
-
-          def foo():
-              """

docs/templates_python.txt

@@ -277 +277 @@
-
-Django comes with a special ``Context`` class,
-``django.template.RequestContext``, that acts slightly differently than
-
+it 
-an `HttpRequest object`_ as its first argument. For example::
-
-    c = RequestContext(request, {