]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
Merge pull request #293 from carldunham/docfix
authorArmin Ronacher <armin.ronacher@active-4.com>
Fri, 6 Jun 2014 16:55:39 +0000 (22:55 +0600)
committerArmin Ronacher <armin.ronacher@active-4.com>
Fri, 6 Jun 2014 16:55:39 +0000 (22:55 +0600)
fixed some typos and clarifying

1  2 
docs/api.rst
jinja2/environment.py
jinja2/filters.py

diff --cc docs/api.rst
Simple merge
index 7cdce6ffbde1c01d1dd4cbf58d5d7cc10cb7b07f,3ab58d1c91e5a6a4d7a191289ba5abfd4bd6bb56..67a3d0ef3cc1f4e0ad39d56da585a505b0de059f
@@@ -108,10 -108,10 +108,10 @@@ class Environment(object)
      Modifications on environments after the first template was loaded
      will lead to surprising effects and undefined behavior.
  
-     Here the possible initialization parameters:
+     Here are the possible initialization parameters:
  
          `block_start_string`
 -            The string marking the begin of a block.  Defaults to ``'{%'``.
 +            The string marking the beginning of a block.  Defaults to ``'{%'``.
  
          `block_end_string`
              The string marking the end of a block.  Defaults to ``'%}'``.
Simple merge