Merge branch '2.5' into 2.6

fabpot · fabpot · commit abc88ee5e714 · 2014-11-11T09:43:58.000+01:00
* 2.5:
  fixed a reference
diff --git a/book/security.rst b/book/security.rst
@@ -1204,7 +1204,7 @@ Thanks to the SensioFrameworkExtraBundle, you can also secure your controller us
     }
 
 For more information, see the
-:doc:`FrameworkExtraBundle documentation </bundles/SensioFrameworkExtraBundle/annotations/security>`.
+`FrameworkExtraBundle documentation <http://symfony.com/doc/master/bundles/SensioFrameworkExtraBundle/annotations/security.html>`_.
 
 Securing other Services
 ~~~~~~~~~~~~~~~~~~~~~~~

Original file line number	Diff line number	Diff line change
`@@ -1204,7 +1204,7 @@ Thanks to the SensioFrameworkExtraBundle, you can also secure your controller us`
`1204`	`1204`	`}`
`1205`	`1205`
`1206`	`1206`	`For more information, see the`
`1207`		-:doc:`FrameworkExtraBundle documentation </bundles/SensioFrameworkExtraBundle/annotations/security>`.
	`1207`	+`FrameworkExtraBundle documentation <http://symfony.com/doc/master/bundles/SensioFrameworkExtraBundle/annotations/security.html>`_.
`1208`	`1208`
`1209`	`1209`	`Securing other Services`
`1210`	`1210`	`~~~~~~~~~~~~~~~~~~~~~~~`