Merge branch '2.3' into 2.7

book/doctrine.rst

@@ -904,7 +904,7 @@ you can let Doctrine create the class for you.
 
 .. code-block:: bash
 
-    $ php app/console doctrine:generate:entity \
+    $ php app/console doctrine:generate:entity --no-interaction \
         --entity="AppBundle:Category" \
         --fields="name:string(255)"
 

book/validation.rst

@@ -217,7 +217,7 @@ The ``validator`` service can be used at any time to validate any object.
 In reality, however, you'll usually work with the ``validator`` indirectly
 when working with forms. Symfony's form library uses the ``validator`` service
 internally to validate the underlying object after values have been submitted.
-The constraint violations on the object are converted into ``FieldError``
+The constraint violations on the object are converted into ``FormError``
 objects that can easily be displayed with your form. The typical form submission
 workflow looks like the following from inside a controller::
 

create_framework/http-kernel-controller-resolver.rst

@@ -91,7 +91,7 @@ introspects the controller signature to determine which arguments to pass to
 it by using the native PHP `reflection`_.
 
 The ``indexAction()`` method needs the Request object as an argument.
-```getArguments()`` knows when to inject it properly if it is type-hinted
+``getArguments()`` knows when to inject it properly if it is type-hinted
 correctly::
 
     public function indexAction(Request $request)

create_framework/templating.rst

@@ -173,7 +173,7 @@ framework does not need to be modified in any way, just create a new
 The ``is_leap_year()`` function returns ``true`` when the given year is a leap
 year, ``false`` otherwise. If the year is ``null``, the current year is
 tested. The controller is simple: it gets the year from the request
-attributes, pass it to the `is_leap_year()`` function, and according to the
+attributes, pass it to the ``is_leap_year()`` function, and according to the
 return value it creates a new Response object.
 
 As always, you can decide to stop here and use the framework as is; it's

quick_tour/the_architecture.rst

@@ -114,7 +114,7 @@ a single Bundle class that describes it::
             new Symfony\Bundle\DoctrineBundle\DoctrineBundle(),
             new Symfony\Bundle\AsseticBundle\AsseticBundle(),
             new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
-            new AppBundle\AppBundle();
+            new AppBundle\AppBundle(),
         );
 
         if (in_array($this->getEnvironment(), array('dev', 'test'))) {