Merge branch '2.3' into 2.5

weaverryan · weaverryan · commit deb7c29ac767 · 2014-12-07T17:24:01.000-05:00
* 2.3:
  Remove ExpressionLanguage reference for 2.3 version
diff --git a/best_practices/security.rst b/best_practices/security.rst
@@ -123,6 +123,7 @@ Using ``@Security``, this looks like:
         // ...
     }
 
+<<<<<<< HEAD
 Using Expressions for Complex Security Restrictions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -207,6 +208,9 @@ Now you can reuse this method both in the template and in the security expressio
     {% endif %}
 
 .. _best-practices-directly-isGranted:
+=======
+.. _best-practices-directy-isGranted:
+>>>>>>> pull/4548
 
 Checking Permissions without @Security
 --------------------------------------
@@ -350,9 +354,9 @@ If your company uses a user login method not supported by Symfony, you can
 develop :doc:`your own user provider </cookbook/security/custom_provider>` and
 :doc:`your own authentication provider </cookbook/security/custom_authentication_provider>`.
 
-.. _`ParamConverter`: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html
+.. _`Security Cookbook Section`: http://symfony.com/doc/current/cookbook/security/index.html
+.. _`security.yml`: http://symfony.com/doc/current/reference/configuration/security.html
 .. _`@Security annotation`: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/security.html
 .. _`security voter`: http://symfony.com/doc/current/cookbook/security/voters_data_permission.html
 .. _`ACL's`: http://symfony.com/doc/current/cookbook/security/acl.html
-.. _`expression`: http://symfony.com/doc/current/components/expression_language/introduction.html
 .. _`FOSUserBundle`: https://github.com/FriendsOfSymfony/FOSUserBundle
