Permalink
Browse files

Merge branch 'master' of github.com:mitsuhiko/jinja2

  • Loading branch information...
2 parents 6fa6cb0 + 6336e77 commit ec9e8eb7937f1ac6c6912f2b2bf18644bd1bbf00 @mitsuhiko mitsuhiko committed Sep 13, 2011
Showing with 4 additions and 4 deletions.
  1. +1 −1 CHANGES
  2. +3 −3 docs/templates.rst
View
2 CHANGES
@@ -23,7 +23,7 @@ Version 2.6
integers instead of longs)
- groupby filter now supports dotted notation for grouping by attributes
of attributes.
-- scoped blocks not properly treat toplevel assignments and imports.
+- scoped blocks now properly treat toplevel assignments and imports.
Previously an import suddenly "disappeared" in a scoped block.
- automatically detect newer Python interpreter versions before loading code
from bytecode caches to prevent segfaults on invalid opcodes. The segfault
View
6 docs/templates.rst
@@ -1180,7 +1180,7 @@ The following functions are available in the global scope by default:
.. class:: joiner(sep=', ')
A tiny helper that can be use to "join" multiple sections. A joiner is
- passed a string and will return that string every time it's calld, except
+ passed a string and will return that string every time it's called, except
the first time in which situation it returns an empty string. You can
use this to join things::
@@ -1276,7 +1276,7 @@ placeholders is a lot easier:
{{ gettext('Hello %(name)s!', name='World') }}
{{ ngettext('%(num)d apple', '%(num)d apples', apples|count) }}
-Note that the `ngettext` function's format string automatically recieves
+Note that the `ngettext` function's format string automatically receives
the count as `num` parameter additionally to the regular parameters.
@@ -1295,7 +1295,7 @@ Loop Controls
If the application enables the :ref:`loopcontrols-extension` it's possible to
use `break` and `continue` in loops. When `break` is reached, the loop is
-terminated, if `continue` is eached the processing is stopped and continues
+terminated; if `continue` is reached, the processing is stopped and continues
with the next iteration.
Here a loop that skips every second item::

0 comments on commit ec9e8eb

Please sign in to comment.