Applied documentation patches by Clemens Hermann.
--HG--
branch : trunk
diff --git a/docs/api.rst b/docs/api.rst
index a12b6a1..5383293 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -14,7 +14,7 @@
Jinja2 uses a central object called the template :class:`Environment`.
Instances of this class are used to store the configuration, global objects
and are used to load templates from the file system or other locations.
-Even if you are creating templates from string by using the constructor of
+Even if you are creating templates from strings by using the constructor of
:class:`Template` class, an environment is created automatically for you,
albeit a shared one.
@@ -61,7 +61,7 @@
`str` type and the other is the `unicode` type, both of which extend a type
called `basestring`. Unfortunately the default is `str` which should not
be used to store text based information unless only ASCII characters are
-used. With Python 2.6 it is possible to my `unicode` the default on a per
+used. With Python 2.6 it is possible to make `unicode` the default on a per
module level and with Python 3 it will be the default.
To explicitly use a unicode string you have to prefix the string literal
@@ -161,7 +161,7 @@
some operations. All parameters except of `hint` should be provided
as keyword parameters for better readability. The `hint` is used as
error message for the exception if provided, otherwise the error
- message generated from `obj` and `name` automatically. The exception
+ message will be generated from `obj` and `name` automatically. The exception
provided as `exc` is raised if something with the generated undefined
object is done that the undefined object does not allow. The default
exception is :exc:`UndefinedError`. If a `hint` is provided the
@@ -540,7 +540,7 @@
publication date: {{ article.pub_date|datetimeformat('%d-%m-%Y') }}
Filters can also be passed the current template context or environment. This
-is useful if a filters wants to return an undefined value or check the current
+is useful if a filter wants to return an undefined value or check the current
:attr:`~Environment.autoescape` setting. For this purpose two decorators
exist: :func:`environmentfilter` and :func:`contextfilter`.