Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed #5187 -- Minor doc tweaks. Thanks, Daniel Hahler.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@5927 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 3b9b87792ab470041c6a2ae5094c8ae236e5d167 1 parent d743ccb
Malcolm Tredinnick authored August 18, 2007
12  django/template/defaulttags.py
@@ -676,16 +676,16 @@ def do_if(parser, token):
676 676
     tag, because the order of logic would be ambigous. For example,
677 677
     this is invalid::
678 678
 
679  
-    {% if athlete_list and coach_list or cheerleader_list %}
  679
+        {% if athlete_list and coach_list or cheerleader_list %}
680 680
 
681  
-    If you need to combine and and or to do advanced logic, just use
  681
+    If you need to combine ``and`` and ``or`` to do advanced logic, just use
682 682
     nested if tags. For example:
683 683
 
684  
-    {% if athlete_list %}
685  
-        {% if coach_list or cheerleader_list %}
686  
-            We have athletes, and either coaches or cheerleaders!
  684
+        {% if athlete_list %}
  685
+            {% if coach_list or cheerleader_list %}
  686
+                We have athletes, and either coaches or cheerleaders!
  687
+            {% endif %}
687 688
         {% endif %}
688  
-    {% endif %}
689 689
     """
690 690
     bits = token.contents.split()
691 691
     del bits[0]
2  django/template/loader_tags.py
@@ -140,7 +140,7 @@ def do_extends(parser, token):
140 140
     This tag may be used in two ways: ``{% extends "base" %}`` (with quotes)
141 141
     uses the literal value "base" as the name of the parent template to extend,
142 142
     or ``{% extends variable %}`` uses the value of ``variable`` as either the
143  
-    name of the parent template to extend (if it evaluates to a string,) or as
  143
+    name of the parent template to extend (if it evaluates to a string) or as
144 144
     the parent tempate itelf (if it evaluates to a Template object).
145 145
     """
146 146
     bits = token.contents.split()
2  docs/contributing.txt
@@ -286,7 +286,7 @@ Please follow these coding standards when writing code for inclusion in Django:
286 286
     * Mark all strings for internationalization; see the `i18n documentation`_
287 287
       for details.
288 288
 
289  
-    * In docstrings, use "action words," like so::
  289
+    * In docstrings, use "action words" such as::
290 290
 
291 291
           def foo():
292 292
               """
2  docs/templates_python.txt
@@ -277,7 +277,7 @@ Subclassing Context: RequestContext
277 277
 
278 278
 Django comes with a special ``Context`` class,
279 279
 ``django.template.RequestContext``, that acts slightly differently than
280  
-the normal ``django.template.Context``. The first difference is that takes
  280
+the normal ``django.template.Context``. The first difference is that it takes
281 281
 an `HttpRequest object`_ as its first argument. For example::
282 282
 
283 283
     c = RequestContext(request, {

0 notes on commit 3b9b877

Please sign in to comment.
Something went wrong with that request. Please try again.