From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Fri, 6 Jun 2014 16:55:39 +0000 (+0600)
Subject: Merge pull request #293 from carldunham/docfix
X-Git-Tag: 2.8~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a04a8b78d023d337b71ca1d0fc830847466c4cb;p=thirdparty%2Fjinja.git

Merge pull request #293 from carldunham/docfix

fixed some typos and clarifying
---

6a04a8b78d023d337b71ca1d0fc830847466c4cb
diff --cc jinja2/environment.py
index 7cdce6ff,3ab58d1c..67a3d0ef
--- a/jinja2/environment.py
+++ b/jinja2/environment.py
@@@ -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 ``'%}'``.