Merge branch 'master' of github.com:Pylons/pyramid

2 files changed, 4 insertions, 152 deletions

diff --git a/docs/narr/environment.rst b/docs/narr/environment.rst
index 412635f08..7bac12ea7 100644
--- a/docs/narr/environment.rst
+++ b/docs/narr/environment.rst
@@ -13,7 +13,6 @@
    single: reload settings
    single: default_locale_name
    single: environment variables
-   single: Mako environment settings
    single: ini file settings
    single: PasteDeploy settings
 
@@ -396,153 +395,6 @@ Is equivalent to using the following statements in your configuration code:
 
 It is fine to use both or either form.
 
-.. _mako_template_renderer_settings:
-
-Mako Template Render Settings
------------------------------
-
-Mako derives additional settings to configure its template renderer that
-should be set when using it. Many of these settings are optional and only need
-to be set if they should be different from the default. The Mako Template
-Renderer uses a subclass of Mako's `template lookup
-<http://www.makotemplates.org/docs/usage.html#usage_lookup>`_ and accepts
-several arguments to configure it.
-
-Mako Directories
-~~~~~~~~~~~~~~~~
-
-The value(s) supplied here are passed in as the template directories. They
-should be in :term:`asset specification` format, for example:
-``my.package:templates``.
-
-+-----------------------------+
-| Config File Setting Name    |
-+=============================+
-|  ``mako.directories``       |
-|                             |
-|                             |
-|                             |
-+-----------------------------+
-
-Mako Module Directory
-~~~~~~~~~~~~~~~~~~~~~
-
-The value supplied here tells Mako where to store compiled Mako templates. If
-omitted, compiled templates will be stored in memory. This value should be an
-absolute path, for example: ``%(here)s/data/templates`` would use a directory
-called ``data/templates`` in the same parent directory as the INI file.
-
-+-----------------------------+
-| Config File Setting Name    |
-+=============================+
-|  ``mako.module_directory``  |
-|                             |
-|                             |
-|                             |
-+-----------------------------+
-
-Mako Input Encoding
-~~~~~~~~~~~~~~~~~~~
-
-The encoding that Mako templates are assumed to have. By default this is set
-to ``utf-8``. If you wish to use a different template encoding, this value
-should be changed accordingly.
-
-+-----------------------------+
-| Config File Setting Name    |
-+=============================+
-|  ``mako.input_encoding``    |
-|                             |
-|                             |
-|                             |
-+-----------------------------+
-
-Mako Error Handler
-~~~~~~~~~~~~~~~~~~
-
-A callable (or a :term:`dotted Python name` which names a 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``  |
-|                             |
-|                             |
-|                             |
-+-----------------------------+
-
-Mako Preprocessor
-~~~~~~~~~~~~~~~~~
-
-.. versionadded:: 1.1
-
-A callable (or a :term:`dotted Python name` which names a callable) which is
-called to preprocess the source before the template is called.  The callable
-will be passed the full template source before it is parsed. The return
-result of the callable will be used as the template source code.
-
-
-+-----------------------------+
-| Config File Setting Name    |
-+=============================+
-|  ``mako.preprocessor``      |
-|                             |
-|                             |
-|                             |
-+-----------------------------+
-
 Examples
 --------
 
diff --git a/docs/narr/i18n.rst b/docs/narr/i18n.rst
index 1de2c8941..95f663584 100644
--- a/docs/narr/i18n.rst
+++ b/docs/narr/i18n.rst
@@ -326,7 +326,7 @@ application.  You run a ``pot-create`` command to extract the messages:
 
    $ cd /place/where/myapplication/setup.py/lives
    $ mkdir -p myapplication/locale
-   $ $VENV/bin/pot-create src > myapplication/locale/myapplication.pot
+   $ $VENV/bin/pot-create -o myapplication/locale/myapplication.pot src
 
 The message catalog ``.pot`` template will end up in:
 
@@ -352,7 +352,7 @@ command from Gettext:
    $ cd /place/where/myapplication/setup.py/lives
    $ cd myapplication/locale
    $ mkdir -p es/LC_MESSAGES
-   $ msginit -l es es/LC_MESSAGES/myapplication.po
+   $ msginit -l es -o es/LC_MESSAGES/myapplication.po
 
 This will create a new the message catalog ``.po`` file will in:
 
@@ -402,11 +402,11 @@ command from Gettext:
 .. code-block:: text
 
    $ cd /place/where/myapplication/setup.py/lives
-   $ msgfmt myapplication/locale/*/LC_MESSAGES/*.po
+   $ msgfmt -o myapplication/locale/es/LC_MESSAGES/myapplication.mo myapplication/locale/es/LC_MESSAGES/myapplication.po
 
 This will create a ``.mo`` file for each ``.po`` file in your
 application.  As long as the :term:`translation directory` in which
-the ``.mo`` file ends up in is configured into your application, these
+the ``.mo`` file ends up in is configured into your application (see :ref:`adding_a_translation_directory`), these
 translations will be available to :app:`Pyramid`.
 
 .. index::