Merge remote branch 'remotes/upstream/master'

1 files changed, 66 insertions, 0 deletions

diff --git a/docs/narr/environment.rst b/docs/narr/environment.rst
index 2aa4064cd..c3fe401ec 100644
--- a/docs/narr/environment.rst
+++ b/docs/narr/environment.rst
@@ -201,6 +201,72 @@ should be changed accordingly.
 |                             |
 +-----------------------------+
 
+Mako Error Handler
+++++++++++++++++++
+
+Python callable which is called whenever Mako compile or runtime exceptions
+occur. The callable is passed the current context as well as the exception. If
+the callable returns True, the exception is considered to be handled, else it
+is re-raised after the function completes. Is used to provide custom
+error-rendering functions.
+
++-----------------------------+
+| Config File Setting Name    |
++=============================+
+|  ``mako.error_handler``     |
+|                             |
+|                             |
+|                             |
++-----------------------------+
+
+Mako Default Filters
+++++++++++++++++++++
+
+List of string filter names that will be applied to all Mako expressions.
+
++-----------------------------+
+| Config File Setting Name    |
++=============================+
+|  ``mako.default_filters``   |
+|                             |
+|                             |
+|                             |
++-----------------------------+
+
+Mako Import
++++++++++++
+
+String list of Python statements, typically individual “import” lines, which
+will be placed into the module level preamble of all generated Python modules.
+
+
++-----------------------------+
+| Config File Setting Name    |
++=============================+
+|  ``mako.imports``           |
+|                             |
+|                             |
+|                             |
++-----------------------------+
+
+
+Mako Strict Undefined
++++++++++++++++++++++
+
+``true`` or ``false``, representing the "strict undefined" behavior of Mako
+(see `Mako Context Variables
+<http://www.makotemplates.org/docs/runtime.html#context-variables>`_).  By
+default, this is ``false``.
+
++-----------------------------+
+| Config File Setting Name    |
++=============================+
+|  ``mako.strict_undefined``  |
+|                             |
+|                             |
+|                             |
++-----------------------------+
+
 Examples
 --------