Merge pull request #230 from p1otr/master

documentation typos

diff --cc docs/api.rst
Simple merge

diff --cc docs/extensions.rst
index 7f55400b93732c4ecb5537e69a7d2180a8dbd294,d3961cf01e61b0da146dfd88db0dcbe165a85a14..2d9493f01edf49bd1389bc6784a3b6a2991f718a
--- 1/docs/extensions.rst
--- 2/docs/extensions.rst
+++ b/docs/extensions.rst
@@@ -213,10 -213,10 +213,10 @@@ Writing Extension
  
  .. 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.
 +useful. Another one would be fragment caching.
  
  When writing extensions you have to keep in mind that you are working with the
  Jinja2 template compiler which does not validate the node tree you are passing

diff --cc docs/templates.rst
Simple merge

diff --cc jinja2/nodes.py
Simple merge