Skip to content

Commit 3775fc0

Browse files
committed
Merge branch '2.8' into 3.0
2 parents 9df83c0 + be32e96 commit 3775fc0

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

Diff for: cookbook/configuration/micro-kernel-trait.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ your *kernel* lives in. Since ``AppKernel`` lives in ``app/``, this template liv
274274
at ``app/Resources/views/micro/random.html.twig``.
275275

276276
Finally, you need a front controller to boot and run the application. Create a
277-
``web/index.php``:
277+
``web/index.php``::
278278

279279
// web/index.php
280280

Diff for: reference/configuration/monolog.rst

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
MonologBundle Configuration ("monolog")
55
=======================================
66

7+
For a full list of handler types and related configuration
8+
options, see `Monolog Configuration`_.
9+
710
Full Default Configuration
811
--------------------------
912

@@ -112,3 +115,5 @@ Full Default Configuration
112115
When the profiler is enabled, a handler is added to store the logs'
113116
messages in the profiler. The profiler uses the name "debug" so it
114117
is reserved and cannot be used in the configuration.
118+
119+
.. _`Monolog Configuration`: https://github.com/symfony/monolog-bundle/blob/master/DependencyInjection/Configuration.php

Diff for: reference/requirements.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ If you want to use Doctrine, you will need to have PDO installed. Additionally,
5151
you need to have the PDO driver installed for the database server you want
5252
to use.
5353

54-
.. _`Requirements section of the README`: https://github.com/symfony/symfony#requirements
54+
.. _`Requirements section of the README`: https://github.com/symfony/symfony/blob/2.8/README.md#requirements

0 commit comments

Comments
 (0)