fix a bunch of typos in the documentation

diff --git a/docs/api.rst b/docs/api.rst
index ae2295fdb53aad0015fad47c07555a2f6e814f1f..90fc371250ff35043bb82d36ad3dc16ff1e3808a 100644 (file)
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -450,7 +450,7 @@ This is especially useful if you have a web application that is initialized on
 the first request and Jinja compiles many templates at once which slows down
 the application.
 
-To use a bytecode cache, instanciate it and pass it to the :class:`Environment`.
+To use a bytecode cache, instantiate it and pass it to the :class:`Environment`.
 
 .. autoclass:: jinja2.BytecodeCache
     :members: load_bytecode, dump_bytecode, clear
@@ -618,7 +618,7 @@ Evaluation Context
 ------------------
 
 The evaluation context (short eval context or eval ctx) is a new object
-introducted in Jinja 2.4 that makes it possible to activate and deactivate
+introduced in Jinja 2.4 that makes it possible to activate and deactivate
 compiled features at runtime.
 
 Currently it is only used to enable and disable the automatic escaping but

diff --git a/docs/extensions.rst b/docs/extensions.rst
index 3878d8c7ca5c343bab991d4c3b108ef0591274af..d3961cf01e61b0da146dfd88db0dcbe165a85a14 100644 (file)
--- a/docs/extensions.rst
+++ b/docs/extensions.rst
@@ -213,7 +213,7 @@ Writing Extensions
 
 .. module:: jinja2.ext
 
-By writing extensions you can add custom tags to Jinja2.  This is a non trival
+By writing extensions you can add custom tags to Jinja2.  This is a non-trivial
 task and usually not needed as the default tags and expressions cover all
 common use cases.  The i18n extension is a good example of why extensions are
 useful, another one would be fragment caching.

diff --git a/docs/sandbox.rst b/docs/sandbox.rst
index 33de4d23b22d53aefb8a00a1dbca45b45313de8d..71ccc0d6deff3b6abd7411c6921250444e9540cc 100644 (file)
--- a/docs/sandbox.rst
+++ b/docs/sandbox.rst
@@ -54,7 +54,7 @@ Operator Intercepting
 
 .. versionadded:: 2.6
 
-For maximum performace Jinja2 will let operators call directly the type
+For maximum performance Jinja2 will let operators call directly the type
 specific callback methods.  This means that it's not possible to have this
 intercepted by overriding :meth:`Environment.call`.  Furthermore a
 conversion from operator to special method is not always directly possible

diff --git a/docs/templates.rst b/docs/templates.rst
index 4a6a379e204d1f8eaf94411345643f19de3863c4..a4e24550fcfcfcacaa745472151ecbd2d390440d 100644 (file)
--- a/docs/templates.rst
+++ b/docs/templates.rst
@@ -474,7 +474,7 @@ include characters that affect the resulting HTML.  There are two approaches:
 manually escaping each variable or automatically escaping everything by default.
 
 Jinja supports both, but what is used depends on the application configuration.
-The default configuaration is no automatic escaping for various reasons:
+The default configuration is no automatic escaping for various reasons:
 
 -   escaping everything except of safe values will also mean that Jinja is
     escaping variables known to not include HTML such as numbers which is
@@ -1033,7 +1033,7 @@ but exists for completeness' sake.  The following operators are supported:
     a look at the ``~`` operator.  ``{{ 1 + 1 }}`` is ``2``.
 
 \-
-    Substract the second number from the first one.  ``{{ 3 - 2 }}`` is ``1``.
+    Subtract the second number from the first one.  ``{{ 3 - 2 }}`` is ``1``.
 
 /
     Divide two numbers.  The return value will be a floating point number.

diff --git a/docs/tricks.rst b/docs/tricks.rst
index 5427a3e8f1edff48fd140a9e1d9c24323249108d..a5dc0a033ab828e0ee583ac6467d05d126298c74 100644 (file)
--- a/docs/tricks.rst
+++ b/docs/tricks.rst
@@ -15,7 +15,7 @@ Null-Master Fallback
 Jinja2 supports dynamic inheritance and does not distinguish between parent
 and child template as long as no `extends` tag is visited.  While this leads
 to the surprising behavior that everything before the first `extends` tag
-including whitespace is printed out instead of being igored, it can be used
+including whitespace is printed out instead of being ignored, it can be used
 for a neat trick.
 
 Usually child templates extend from one template that adds a basic HTML

diff --git a/jinja2/nodes.py b/jinja2/nodes.py
index aa75f27247fc1ddd9492f8f3c68013b121156bb0..1e082bedad876891d3896f8877720331b4b158a7 100644 (file)
--- a/jinja2/nodes.py
+++ b/jinja2/nodes.py
@@ -743,7 +743,7 @@ class Add(BinExpr):
 
 
 class Sub(BinExpr):
-    """Substract the right from the left node."""
+    """Subtract the right from the left node."""
     operator = '-'