use "Jinja" instead of "Jinja2"

diff --git a/docs/sandbox.rst b/docs/sandbox.rst
index 0dac5a090866d950e0d91dcb8eb5690179386b8c..1222d0250583096bdfbf8309d47f9b171ff0d53b 100644 (file)
--- a/docs/sandbox.rst
+++ b/docs/sandbox.rst
@@ -75,7 +75,7 @@ will use the :attr:`SandboxedEnvironment.binop_table` to translate
 operator symbols into callbacks performing the default operator behavior.
 
 This example shows how the power (``**``) operator can be disabled in
-Jinja2::
+Jinja::
 
     from jinja2.sandbox import SandboxedEnvironment
 

diff --git a/docs/switching.rst b/docs/switching.rst
index 1e2701df0ba451644864a1eb6d85fdab03fbd47a..8225b2ee05fc45ed794271d31a39ec3b03bdddd4 100644 (file)
--- a/docs/switching.rst
+++ b/docs/switching.rst
@@ -124,7 +124,7 @@ argument passing is different.  A template that looks like this in Django::
 
     {{ items|join:", " }}
 
-looks like this in Jinja2::
+looks like this in Jinja::
 
     {{ items|join(', ') }}
 
@@ -158,7 +158,7 @@ example, the Django template::
         No items!
     {% endfor %}
 
-...looks like this in Jinja2::
+...looks like this in Jinja::
 
     {% for item in items %}
         {{ item }}
@@ -169,7 +169,7 @@ example, the Django template::
 Cycle
 ~~~~~
 
-The ``{% cycle %}`` tag does not exist in Jinja2; however, you can achieve the
+The ``{% cycle %}`` tag does not exist in Jinja; however, you can achieve the
 same output by using the `cycle` method on the loop context special variable.
 
 The following Django template::
@@ -178,7 +178,7 @@ The following Django template::
         <li class="{% cycle 'odd' 'even' %}">{{ user }}</li>
     {% endfor %}
 
-...looks like this in Jinja2::
+...looks like this in Jinja::
 
     {% for user in users %}
         <li class="{{ loop.cycle('odd', 'even') }}">{{ user }}</li>

diff --git a/jinja2/compiler.py b/jinja2/compiler.py
index b734611bde7a22a844766aafe373d3609e270c21..488ef0a375d2dcc287cb6ecc0555e7aed1c6ecef 100644 (file)
--- a/jinja2/compiler.py
+++ b/jinja2/compiler.py
@@ -521,7 +521,7 @@ class CodeGenerator(NodeVisitor):
         undeclared = find_undeclared(node.body, ('caller', 'kwargs', 'varargs'))
 
         if 'caller' in undeclared:
-            # In older Jinja2 versions there was a bug that allowed caller
+            # In older Jinja versions there was a bug that allowed caller
             # to retain the special behavior even if it was mentioned in
             # the argument list.  However thankfully this was only really
             # working if it was the last argument.  So we are explicitly