Commit3775fc0

committed

Merge branch '2.8' into 3.0

2 parents9df83c0 +be32e96 commit3775fc0Copy full SHA for 3775fc0

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -274,7 +274,7 @@ your kernel lives in. Since ``AppKernel`` lives in ``app/``, this template liv
`274`	`274`	at ``app/Resources/views/micro/random.html.twig``.
`275`	`275`
`276`	`276`	`Finally, you need a front controller to boot and run the application. Create a`
`277`		-``web/index.php``:
	`277`	+``web/index.php``::
`278`	`278`
`279`	`279`	`// web/index.php`
`280`	`280`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,9 @@`
`4`	`4`	`MonologBundle Configuration ("monolog")`
`5`	`5`	`=======================================`
`6`	`6`
	`7`	`+For a full list of handler types and related configuration`
	`8`	+options, see `Monolog Configuration`_.
	`9`	`+`
`7`	`10`	`Full Default Configuration`
`8`	`11`	`--------------------------`
`9`	`12`
`@@ -112,3 +115,5 @@ Full Default Configuration`
`112`	`115`	`When the profiler is enabled, a handler is added to store the logs'`
`113`	`116`	`messages in the profiler. The profiler uses the name "debug" so it`
`114`	`117`	`is reserved and cannot be used in the configuration.`
	`118`	`+`
	`119`	+.. _`Monolog Configuration`:https://github.com/symfony/monolog-bundle/blob/master/DependencyInjection/Configuration.php

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -51,4 +51,4 @@ If you want to use Doctrine, you will need to have PDO installed. Additionally,`
`51`	`51`	`you need to have the PDO driver installed for the database server you want`
`52`	`52`	`to use.`
`53`	`53`
`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

Comments

(0)