Django

Code

Changeset 5927

Show
Ignore:
Timestamp:
08/18/07 00:43:38 (1 year ago)
Author:
mtredinnick
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/template/defaulttags.py

    r5815 r5927  
    677677    this is invalid:: 
    678678 
    679     {% if athlete_list and coach_list or cheerleader_list %} 
    680  
    681     If you need to combine and and or to do advanced logic, just use 
     679        {% if athlete_list and coach_list or cheerleader_list %} 
     680 
     681    If you need to combine ``and`` and ``or`` to do advanced logic, just use 
    682682    nested if tags. For example: 
    683683 
    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 %} 
    687688        {% endif %} 
    688     {% endif %} 
    689689    """ 
    690690    bits = token.contents.split() 

  • django/trunk/django/template/loader_tags.py

    r5511 r5927  
    141141    uses the literal value "base" as the name of the parent template to extend, 
    142142    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 
    144144    the parent tempate itelf (if it evaluates to a Template object). 
    145145    """ 

  • django/trunk/docs/contributing.txt

    r5872 r5927  
    287287      for details. 
    288288 
    289     * In docstrings, use "action words," like so:: 
     289    * In docstrings, use "action words" such as:: 
    290290 
    291291          def foo(): 

  • django/trunk/docs/templates_python.txt

    r5667 r5927  
    278278Django comes with a special ``Context`` class, 
    279279``django.template.RequestContext``, that acts slightly differently than 
    280 the normal ``django.template.Context``. The first difference is that takes 
     280the normal ``django.template.Context``. The first difference is that it takes 
    281281an `HttpRequest object`_ as its first argument. For example:: 
    282282