Merge branch '2.4' into 2.5

* 2.4:
  Fix xml route configuration for routing condition
  Remove "Controllers extends ContainerAware" best practice
  Fixed the format of one letter-based list
  Fixed bad indenting (the list was treated as a blockquote)

Author: weaverryan

book/routing.rst

@@ -747,11 +747,9 @@ can be extended to have an almost infinite flexibility using ``conditions``:
             xsi:schemaLocation="http://symfony.com/schema/routing
                 http://symfony.com/schema/routing/routing-1.0.xsd">
 
-            <route id="contact"
-                path="/contact"
-                condition="context.getMethod() in ['GET', 'HEAD'] and request.headers.get('User-Agent') matches '/firefox/i'"
-            >
+            <route id="contact" path="/contact">
                 <default key="_controller">AcmeDemoBundle:Main:contact</default>
+                <condition>context.getMethod() in ['GET', 'HEAD'] and request.headers.get('User-Agent') matches '/firefox/i'</condition>
             </route>
         </routes>
 

cookbook/bundles/best_practices.rst

@@ -194,23 +194,6 @@ Extensive documentation should also be provided in the
 the ``Resources/doc/`` directory; the ``Resources/doc/index.rst`` file is
 the only mandatory file and must be the entry point for the documentation.
 
-Controllers
------------
-
-As a best practice, controllers in a bundle that's meant to be distributed
-to others must not extend the
-:class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller` base class.
-They can implement
-:class:`Symfony\\Component\\DependencyInjection\\ContainerAwareInterface` or
-extend :class:`Symfony\\Component\\DependencyInjection\\ContainerAware`
-instead.
-
-.. note::
-
-    If you have a look at
-    :class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller` methods,
-    you will see that they are only nice shortcuts to ease the learning curve.
-
 Routing
 -------
 

cookbook/email/cloud.rst

@@ -101,17 +101,17 @@ And that's it, you're ready to start sending emails through the cloud!
 
     If you intend to use Amazon SES, please note the following:
 
-        * You have to sign up to `Amazon Web Services (AWS)`_;
+    * You have to sign up to `Amazon Web Services (AWS)`_;
 
-        * Every sender address used in the ``From`` or ``Return-Path`` (bounce
-          address) header needs to be confirmed by the owner. You can also
-          confirm an entire domain;
+    * Every sender address used in the ``From`` or ``Return-Path`` (bounce
+      address) header needs to be confirmed by the owner. You can also
+      confirm an entire domain;
 
-        * Initially you are in a restricted sandbox mode. You need to request
-          production access before being allowed to send to arbitrary
-          recipients;
+    * Initially you are in a restricted sandbox mode. You need to request
+      production access before being allowed to send to arbitrary
+      recipients;
 
-        * SES may be subject to a charge.
+    * SES may be subject to a charge.
 
 .. _`Amazon's Simple Email Service (SES)`: http://aws.amazon.com/ses
 .. _`SES console`: https://console.aws.amazon.com/ses

reference/constraints/Expression.rst

@@ -53,10 +53,9 @@ properties::
 
 To validate the object, you have some special requirements:
 
-* A) If ``isTechnicalPost`` is true, then ``category`` must be either ``php``
-  or ``symfony``;
-
-* B) If ``isTechnicalPost`` is false, then ``category`` can be anything.
+A) If ``isTechnicalPost`` is true, then ``category`` must be either ``php``
+   or ``symfony``;
+B) If ``isTechnicalPost`` is false, then ``category`` can be anything.
 
 One way to accomplish this is with the Expression constraint: