Skip to content

Commit

Permalink
Fixed #2580 -- Added missing </html> tag in docs/templates.txt exampl…
Browse files Browse the repository at this point in the history
…es. Thanks, jonathan-django@jmail.za.net

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3635 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
adrianholovaty committed Aug 21, 2006
1 parent cccbe23 commit dbaf121
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions docs/templates.txt
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ It's easiest to understand template inheritance by starting with an example::
{% block content %}{% endblock %} {% block content %}{% endblock %}
</div> </div>
</body> </body>
</html>


This template, which we'll call ``base.html``, defines a simple HTML skeleton This template, which we'll call ``base.html``, defines a simple HTML skeleton
document that you might use for a simple two-column page. It's the job of document that you might use for a simple two-column page. It's the job of
Expand Down Expand Up @@ -196,6 +197,7 @@ like::
<p>This is my second entry.</p> <p>This is my second entry.</p>
</div> </div>
</body> </body>
</html>


Note that since the child template didn't define the ``sidebar`` block, the Note that since the child template didn't define the ``sidebar`` block, the
value from the parent template is used instead. Content within a ``{% block %}`` value from the parent template is used instead. Content within a ``{% block %}``
Expand Down Expand Up @@ -363,7 +365,7 @@ extends


Signal that this template extends a parent template. Signal that this template extends a parent template.


This tag can be used in two ways: This tag can be used in two ways:


* ``{% extends "base.html" %}`` (with quotes) uses the literal value * ``{% extends "base.html" %}`` (with quotes) uses the literal value
``"base.html"`` as the name of the parent template to extend. ``"base.html"`` as the name of the parent template to extend.
Expand Down Expand Up @@ -961,13 +963,13 @@ any string.
pluralize pluralize
~~~~~~~~~ ~~~~~~~~~


Returns a plural suffix if the value is not 1. By default, this suffix is ``'s'``. Returns a plural suffix if the value is not 1. By default, this suffix is ``'s'``.


Example:: Example::


You have {{ num_messages }} message{{ num_messages|pluralize }}. You have {{ num_messages }} message{{ num_messages|pluralize }}.


For words that require a suffix other than ``'s'``, you can provide an alternate For words that require a suffix other than ``'s'``, you can provide an alternate
suffix as a parameter to the filter. suffix as a parameter to the filter.


Example:: Example::
Expand Down

0 comments on commit dbaf121

Please sign in to comment.