Merge remote-tracking branch 'upstream/3.3' into 3.3

Author: javiereguiluz

components/config/definition.rst

@@ -555,7 +555,7 @@ tree with ``append()``::
             ->isRequired()
             ->requiresAtLeastOneElement()
             ->useAttributeAsKey('name')
-            ->arrayPrototype
+            ->arrayPrototype()
                 ->children()
                     ->scalarNode('value')->isRequired()->end()
                 ->end()

doctrine.rst

@@ -184,8 +184,8 @@ can automatically generate an empty ``test_project`` database for you:
                 'dbal' => array(
                     'charset' => 'utf8mb4',
                     'default_table_options' => array(
-                        'charset' => 'utf8mb4'
-                        'collate' => 'utf8mb4_unicode_ci'
+                        'charset' => 'utf8mb4',
+                        'collate' => 'utf8mb4_unicode_ci',
                     )
                 ),
             ));

reference/configuration/security.rst

@@ -478,7 +478,7 @@ dn_string
 **type**: ``string`` **default**: ``{username}``
 
 This is the string which will be used as the bind DN. The ``{username}``
-placeholder will be replaced with the user-provided value (his login).
+placeholder will be replaced with the user-provided value (their login).
 Depending on your LDAP server's configuration, you may need to override
 this value.
 

reference/configuration/twig.rst

@@ -55,7 +55,6 @@ TwigBundle Configuration ("twig")
             paths:
                 '%kernel.project_dir%/vendor/acme/foo-bar/templates': foo_bar
 
-            # The following were added in Symfony 2.7.
             date:
                 format: d.m.Y, H:i:s
                 interval_format: '%%d days'

testing/bootstrap.rst

@@ -20,7 +20,7 @@ To do this, first add a file that executes your bootstrap work::
 
     require __DIR__.'/../vendor/autoload.php';
 
-Then, configure ``phpunit.xml.dist`` to execute this ``bootstra.php`` file
+Then, configure ``phpunit.xml.dist`` to execute this ``bootstrap.php`` file
 before running the tests:
 
 .. code-block:: xml
@@ -49,4 +49,4 @@ cache to be cleared:
     </phpunit>
 
 This now becomes an environment variable (i.e. ``$_ENV``) that's available
-in the custom bootstrap file (``tests.bootstrap.php``).
+in the custom bootstrap file (``tests/bootstrap.php``).

workflow/usage.rst

@@ -172,7 +172,7 @@ what actions are allowed on a blog post::
         // ...
     }
 
-    // See all the available transition for the post in the current state
+    // See all the available transitions for the post in the current state
     $transitions = $workflow->getEnabledTransitions($post);
 
 Using Events
@@ -250,7 +250,8 @@ order:
     * ``workflow.[workflow name].announce``
     * ``workflow.[workflow name].announce.[transition name]``
 
-Here is an example how to enable logging for every time a the "blog_publishing" workflow leaves a place::
+Here is an example of how to enable logging for every time a the "blog_publishing"
+workflow leaves a place::
 
     use Psr\Log\LoggerInterface;
     use Symfony\Component\EventDispatcher\EventSubscriberInterface;