Merge branch '2.8' into 3.0

symfony · Jan 10, 2016 · 3775fc0 · 3775fc0
2 parents 9df83c0 + be32e96
commit 3775fc0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/cookbook/configuration/micro-kernel-trait.rst b/cookbook/configuration/micro-kernel-trait.rst
@@ -274,7 +274,7 @@ your *kernel* lives in. Since ``AppKernel`` lives in ``app/``, this template liv
 at ``app/Resources/views/micro/random.html.twig``.
 
 Finally, you need a front controller to boot and run the application. Create a
-``web/index.php``:
+``web/index.php``::
 
     // web/index.php
 

diff --git a/reference/configuration/monolog.rst b/reference/configuration/monolog.rst
@@ -4,6 +4,9 @@
 MonologBundle Configuration ("monolog")
 =======================================
 
+For a full list of handler types and related configuration
+options, see `Monolog Configuration`_.
+
 Full Default Configuration
 --------------------------
 
@@ -112,3 +115,5 @@ Full Default Configuration
     When the profiler is enabled, a handler is added to store the logs'
     messages in the profiler. The profiler uses the name "debug" so it
     is reserved and cannot be used in the configuration.
+
+.. _`Monolog Configuration`: https://github.com/symfony/monolog-bundle/blob/master/DependencyInjection/Configuration.php
diff --git a/reference/requirements.rst b/reference/requirements.rst
@@ -51,4 +51,4 @@ If you want to use Doctrine, you will need to have PDO installed. Additionally,
 you need to have the PDO driver installed for the database server you want
 to use.
 
-.. _`Requirements section of the README`: https://github.com/symfony/symfony#requirements
+.. _`Requirements section of the README`: https://github.com/symfony/symfony/blob/2.8/README.md#requirements