Merge pull request #1221 in develop

zendframework · Mar 12, 2014 · faec53c · faec53c
2 parents da79449 + a662736
commit faec53c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/docs/languages/en/modules/zend.module-manager.module-manager.rst b/docs/languages/en/modules/zend.module-manager.module-manager.rst
@@ -159,7 +159,11 @@ By default, Zend Framework provides several useful module manager listeners.
    +------------------------------------------------+------------------------+---------------------------------------+-------------------------------+
    | ``Zend\View\HelperPluginManager``              | ``view_helpers``       | ``ViewHelperProviderInterface``       | ``getViewHelperConfig``       |
    +------------------------------------------------+------------------------+---------------------------------------+-------------------------------+
-
+   | ``Zend\View\LogProcessorManager``              | ``log_processors``     | ``LogProcessorProviderInterface``     | ``getLogProcessorConfig``     |
+   +------------------------------------------------+------------------------+---------------------------------------+-------------------------------+
+   | ``Zend\View\LogWriterManager``                 | ``log_writers``        | ``LogWritersProviderInterface``       | ``getLogWriterConfig``        |
+   +------------------------------------------------+------------------------+---------------------------------------+-------------------------------+
+
    Configuration follows the examples in the :ref:`ServiceManager configuration
    section <zend.service-manager.quick-start.config>`. As a brief recap, the
    following configuration keys and values are allowed:

diff --git a/docs/languages/en/tutorials/config.advanced.rst b/docs/languages/en/tutorials/config.advanced.rst
@@ -338,6 +338,10 @@ Configuration mapping table
 +------------------------------+---------------------------------------+---------------------------------+------------------------+
 | ``ViewHelperManager``        | ``ViewHelperProviderInterface``       | ``getViewHelperConfig()``       | ``view_helpers``       |
 +------------------------------+---------------------------------------+---------------------------------+------------------------+
+| ``LogProcessorManager``      | ``LogProcessorProviderInterface``     | ``getLogProcessorConfig``       | ``log_processors``     |
++------------------------------+---------------------------------------+---------------------------------+------------------------+
+| ``LogWriterManager``         | ``LogWritersProviderInterface``       | ``getLogWriterConfig``          | ``log_writers``        |
++------------------------------+---------------------------------------+---------------------------------+------------------------+
 
 Configuration Priority
 ----------------------