Merge branch '2.7' into 2.8

symfony · Jan 10, 2016 · f95ca48 · f95ca48
2 parents fb5ad59 + c441f6d
commit f95ca48
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
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
@@ -56,4 +56,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.7/README.md#requirements