Merge branch '2.5' into 2.6

weaverryan · weaverryan · commit 5ec7cd15d799 · 2014-11-24T18:19:51.000-05:00
* 2.5:
  link to a bundle's current (not master) docs
diff --git a/book/security.rst b/book/security.rst
@@ -2327,7 +2327,7 @@ Learn more from the Cookbook
 * :doc:`/cookbook/security/remember_me`
 * :doc:`How to Restrict Firewalls to a Specific Request </cookbook/security/firewall_restriction>`
 
-.. _`FrameworkExtraBundle documentation`: http://symfony.com/doc/master/bundles/SensioFrameworkExtraBundle/annotations/security.html
+.. _`FrameworkExtraBundle documentation`: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/security.html
 .. _`FOSUserBundle`: https://github.com/FriendsOfSymfony/FOSUserBundle
 .. _`implement the \Serializable interface`: http://php.net/manual/en/class.serializable.php
 .. _`Timing attack`: http://en.wikipedia.org/wiki/Timing_attack
