Merge branch '2.4'

components/dom_crawler.rst

@@ -106,11 +106,14 @@ explicitly.
 
 Consider the XML below:
 
+.. code-block:: xml
+
     <?xml version="1.0" encoding="UTF-8"?>
     <entry
-      xmlns="http://www.w3.org/2005/Atom"
-      xmlns:media="http://search.yahoo.com/mrss/"
-      xmlns:yt="http://gdata.youtube.com/schemas/2007">
+        xmlns="http://www.w3.org/2005/Atom"
+        xmlns:media="http://search.yahoo.com/mrss/"
+        xmlns:yt="http://gdata.youtube.com/schemas/2007"
+    >
         <id>tag:youtube.com,2008:video:kgZRZmEc9j4</id>
         <yt:accessControl action="comment" permission="allowed"/>
         <yt:accessControl action="videoRespond" permission="moderated"/>

cookbook/security/_supportsToken.rst.inc

@@ -0,0 +1,10 @@
+After Symfony calls ``createToken()``, it will then call ``supportsToken()``
+on your class (and any other authentication listeners) to figure out who should
+handle the token. This is just a way to allow several authentication mechanisms
+to be used for the same firewall (that way, you can for instance first try
+to authenticate the user via a certificate or an API key and fall back to
+a form login).
+
+Mostly, you just need to make sure that this method returns ``true`` for a
+token that has been created by ``createToken()``. Your logic should probably
+look exactly like this example.