Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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 malcolmt authored
12 django/template/defaulttags.py
View
@@ -676,16 +676,16 @@ def do_if(parser, token):
tag, because the order of logic would be ambigous. For example,
this is invalid::
- {% if athlete_list and coach_list or cheerleader_list %}
+ {% if athlete_list and coach_list or cheerleader_list %}
- If you need to combine and and or to do advanced logic, just use
+ 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]
2  django/template/loader_tags.py
View
@@ -140,7 +140,7 @@ def do_extends(parser, token):
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()
2  docs/contributing.txt
View
@@ -286,7 +286,7 @@ Please follow these coding standards when writing code for inclusion in Django:
* Mark all strings for internationalization; see the `i18n documentation`_
for details.
- * In docstrings, use "action words," like so::
+ * In docstrings, use "action words" such as::
def foo():
"""
2  docs/templates_python.txt
View
@@ -277,7 +277,7 @@ Subclassing Context: RequestContext
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, {
Please sign in to comment.
Something went wrong with that request. Please try again.