summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAlex Chan <alex@alexwlchan.net>2015-04-05 22:42:34 +0100
committerAlex Chan <alex@alexwlchan.net>2015-04-05 22:42:34 +0100
commit972c03055228fd1c5c692f1ad8c717946d88498c (patch)
tree807fc7bb5a1741dc882da408e53a6d23e6a593b3 /docs
parent502050c9dc677414a1b0261b40f4999334fd4ba6 (diff)
downloadjinja2-972c03055228fd1c5c692f1ad8c717946d88498c.tar.gz
Fix a few small typos in the docs
Diffstat (limited to 'docs')
-rw-r--r--docs/api.rst4
-rw-r--r--docs/faq.rst2
-rw-r--r--docs/switching.rst2
3 files changed, 4 insertions, 4 deletions
diff --git a/docs/api.rst b/docs/api.rst
index 02a8138..d143ebc 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -167,7 +167,7 @@ useful if you want to dig deeper into Jinja2 or :ref:`develop extensions
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
- `name` may be ommited.
+ `name` may be omitted.
The most common way to create an undefined object is by providing
a name only::
@@ -187,7 +187,7 @@ useful if you want to dig deeper into Jinja2 or :ref:`develop extensions
return environment.undefined('no first item, sequence was empty')
If it the `name` or `obj` is known (for example because an attribute
- was accessed) it shold be passed to the undefined object, even if
+ was accessed) it should be passed to the undefined object, even if
a custom `hint` is provided. This gives undefined objects the
possibility to enhance the error message.
diff --git a/docs/faq.rst b/docs/faq.rst
index 00a4d0d..3869684 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -135,7 +135,7 @@ the traceback may be incomplete. There is currently no good workaround
for Jython or the AppEngine as ctypes is unavailable there and it's not
possible to use the debugsupport extension.
-If you are working in the Google Appengine development server you can
+If you are working in the Google AppEngine development server you can
whitelist the ctypes module to restore the tracebacks. This however won't
work in production environments::
diff --git a/docs/switching.rst b/docs/switching.rst
index 32f04fd..ab94124 100644
--- a/docs/switching.rst
+++ b/docs/switching.rst
@@ -4,7 +4,7 @@ Switching from other Template Engines
.. highlight:: html+jinja
If you have used a different template engine in the past and want to switch
-to Jinja2 here is a small guide that shows the basic syntatic and semantic
+to Jinja2 here is a small guide that shows the basic syntactic and semantic
changes between some common, similar text template engines for Python.
Jinja1