Commitb50dd72

committed

Merge branch '2.4' into 2.5

* 2.4: Applied comments Update remove.rst Update remove.rst Update remove.rst Removed unnecessary comma

2 parents90c2cc1 +a16b71b commitb50dd72Copy full SHA for b50dd72

File tree

-1

lines changed

-1

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -81,6 +81,12 @@ can remove the ``Acme`` directory as well.
`81`	`81`
`82`	`82`	`echo $this->container->get('kernel')->getBundle('AcmeDemoBundle')->getPath();`
`83`	`83`
	`84`	`+3.1 Remove Bundle Assets`
	`85`	`+~~~~~~~~~~~~~~~~~~~~~~~~`
	`86`	`+`
	`87`	`+Remove the assets of the bundle in the web/ directory (e.g.`
	`88`	+``web/bundles/acmedemo`` for the AcmeDemoBundle).
	`89`	`+`
`84`	`90`	`4. Remove Integration in other Bundles`
`85`	`91`	`--------------------------------------`
`86`	`92`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -367,7 +367,7 @@ fetch the user from the database before checking the password validity.`
`367`	`367`	`..note::`
`368`	`368`
`369`	`369`	`By default, the entity provider uses the default entity manager to fetch`
`370`		`- user information from the database. If you,`
	`370`	`+ user information from the database. If you`
`371`	`371`	:doc:`use multiple entity managers</cookbook/doctrine/multiple_entity_managers>`,
`372`	`372`	you can specify which manager to use with the ``manager_name`` option:
`373`	`373`

Comments

(0)