Merge https://github.com/Pylons/pyramid

4 files changed, 69 insertions, 21 deletions

diff --git a/docs/narr/environment.rst b/docs/narr/environment.rst
index 2aa4064cd..ecf85e464 100644
--- a/docs/narr/environment.rst
+++ b/docs/narr/environment.rst
@@ -201,6 +201,54 @@ 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``           |
+|                             |
+|                             |
+|                             |
++-----------------------------+
+
 Examples
 --------
 
diff --git a/docs/narr/hybrid.rst b/docs/narr/hybrid.rst
index 61ac68d5d..b89d10c9f 100644
--- a/docs/narr/hybrid.rst
+++ b/docs/narr/hybrid.rst
@@ -358,7 +358,7 @@ Using the ``traverse`` Argument In a Route Definition
 
 Rather than using the ``*traverse`` remainder marker in a pattern, you
 can use the ``traverse`` argument to the
-:meth:`pyramid.configuration.Configurator.add_route`` method.
+:meth:`pyramid.configuration.Configurator.add_route` method.
 
 When you use the ``*traverse`` remainder marker, the traversal path is
 limited to being the remainder segments of a request URL when a route
diff --git a/docs/narr/i18n.rst b/docs/narr/i18n.rst
index 703883fb2..9e2071872 100644
--- a/docs/narr/i18n.rst
+++ b/docs/narr/i18n.rst
@@ -773,8 +773,8 @@ If this setting is supplied within the :app:`Pyramid` application
 .. code-block:: python
    :linenos:
 
-   from pyramid.setttings import get_settings
-   settings = get_settings()
+   from pyramid.threadlocal import get_current_registry
+   settings = get_current_registry().settings
    default_locale_name = settings['default_locale_name']
 
 "Detecting" Available Languages
@@ -822,8 +822,9 @@ Then as a part of the code of a custom :term:`locale negotiator`:
 
 .. code-block:: py
 
-  from pyramid.settings import get_settings
-  languages = get_settings()['available_languages'].split()
+   from pyramid.threadlocal import get_current_registry
+   settings = get_current_registry().settings
+   languages = settings['available_languages'].split()
 
 This is only a suggestion.  You can create your own "available
 languages" configuration scheme as necessary.
diff --git a/docs/narr/static.rst b/docs/narr/static.rst
index efeabd012..a01cbbabf 100644
--- a/docs/narr/static.rst
+++ b/docs/narr/static.rst
@@ -69,22 +69,21 @@ when generating a URL using :func:`pyramid.url.static_url`.
 .. note::
 
    Using :func:`pyramid.url.static_url` in conjunction with a
-   :meth:`pyramid.configuration.Configurator.add_static_view` makes
-   it possible to put static media on a separate webserver during
-   production (if the ``name`` argument to
-   :meth:`pyramid.configuration.Configurator.add_static_view` is a
-   URL), while keeping static media package-internal and served by the
-   development webserver during development (if the ``name`` argument
-   to :meth:`pyramid.configuration.Configurator.add_static_view` is
-   a view name).  To create such a circumstance, we suggest using the
-   :func:`pyramid.settings.get_settings` API in conjunction with a
-   setting in the application ``.ini`` file named ``media_location``.
-   Then set the value of ``media_location`` to either a view name or a
-   URL depending on whether the application is being run in
-   development or in production (use a different `.ini`` file for
-   production than you do for development).  This is just a suggestion
-   for a pattern; any setting name other than ``media_location`` could
-   be used.
+   :meth:`pyramid.configuration.Configurator.add_static_view` makes it
+   possible to put static media on a separate webserver during production (if
+   the ``name`` argument to
+   :meth:`pyramid.configuration.Configurator.add_static_view` is a URL),
+   while keeping static media package-internal and served by the development
+   webserver during development (if the ``name`` argument to
+   :meth:`pyramid.configuration.Configurator.add_static_view` is a view
+   name).  To create such a circumstance, we suggest using the
+   :attr:`pyramid.registry.Registry.settings` API in conjunction with a
+   setting in the application ``.ini`` file named ``media_location``.  Then
+   set the value of ``media_location`` to either a view name or a URL
+   depending on whether the application is being run in development or in
+   production (use a different `.ini`` file for production than you do for
+   development).  This is just a suggestion for a pattern; any setting name
+   other than ``media_location`` could be used.
 
 For example, :meth:`pyramid.configuration.Configurator.add_static_view` may
 be fed a ``name`` argument which is ``http://example.com/images``: