Merge branch '2.3' into 2.5

* 2.3:
  Add missing comma in array
  Fix typos
  Remove block which doesn't make sense after best practices

Author: weaverryan

components/dependency_injection/parameters.rst

@@ -140,49 +140,6 @@ rather than being tied up and hidden with the service definition:
 If you were using this elsewhere as well, then you would only need to change
 the parameter value in one place if needed.
 
-You can also use the parameters in the service definition, for example,
-making the class of a service a parameter:
-
-.. configuration-block::
-
-    .. code-block:: yaml
-
-        parameters:
-            mailer.transport: sendmail
-
-        services:
-            mailer:
-                class:     Mailer
-                arguments: ["%mailer.transport%"]
-
-    .. code-block:: xml
-
-        <?xml version="1.0" encoding="UTF-8" ?>
-        <container xmlns="http://symfony.com/schema/dic/services"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
-            <parameters>
-                <parameter key="mailer.transport">sendmail</parameter>
-            </parameters>
-
-            <services>
-                <service id="mailer" class="Mailer">
-                    <argument>%mailer.transport%</argument>
-                </service>
-            </services>
-        </container>
-
-    .. code-block:: php
-
-        use Symfony\Component\DependencyInjection\Reference;
-
-        $container->setParameter('mailer.transport', 'sendmail');
-
-        $container
-            ->register('mailer', 'Mailer')
-            ->addArgument('%mailer.transport%');
-
 .. note::
 
     The percent sign inside a parameter or argument, as part of the string, must

components/serializer.rst

@@ -153,7 +153,7 @@ of the ``Person`` class would be encoded in XML format::
     </person>
     EOF;
 
-    $person = $serializer->deserialize($data,'Acme\Person','xml');
+    $person = $serializer->deserialize($data, 'Acme\Person', 'xml');
 
 In this case, :method:`Symfony\\Component\\Serializer\\Serializer::deserialize`
 needs three parameters:

components/templating/introduction.rst

@@ -196,7 +196,7 @@ method is used.
 
     $templating = new DelegatingEngine(array(
         new PhpEngine(...),
-        new CustomEngine(...)
+        new CustomEngine(...),
     ));
 
 .. _Packagist: https://packagist.org/packages/symfony/templating