Merge branch '2.3' into 2.6

Conflicts:
	cookbook/validation/custom_constraint.rst

book/security.rst

@@ -128,9 +128,9 @@ A) Configuring how your Users will Authenticate
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The main job of a firewall is to configure *how* your users will authenticate.
-Will they use a login form? Http Basic? An API token? All of the above?
+Will they use a login form? HTTP basic authentication? An API token? All of the above?
 
-Let's start with Http Basic (the old-school pop-up) and work up from there.
+Let's start with HTTP basic authentication (the old-school prompt) and work up from there.
 To activate this, add the ``http_basic`` key under your firewall:
 
 .. configuration-block::
@@ -265,7 +265,7 @@ user to be logged in to access this URL:
     You'll learn more about this ``ROLE_ADMIN`` thing and denying access
     later in the :ref:`security-authorization` section.
 
-Great! Now, if you go to ``/admin``, you'll see the HTTP Basic popup:
+Great! Now, if you go to ``/admin``, you'll see the HTTP basic auth prompt:
 
 .. image:: /images/book/security_http_basic_popup.png
    :align: center
@@ -376,7 +376,7 @@ probably only need one. If you *do* have multiple, you can configure which
 Try to login using username ``admin`` and password ``kitten``. You should
 see an error!
 
-    No encoder has been configured for account "Symfony\Component\Security\Core\User\User"
+    No encoder has been configured for account "Symfony\\Component\\Security\\Core\\User\\User"
 
 To fix this, add an ``encoders`` key:
 
@@ -598,8 +598,8 @@ before inserting them into the database? Don't worry, see
 D) Configuration Done!
 ~~~~~~~~~~~~~~~~~~~~~~
 
-Congratulations! You now have a working authentication system that uses Http
-Basic and loads users right from the ``security.yml`` file.
+Congratulations! You now have a working authentication system that uses HTTP
+basic auth and loads users right from the ``security.yml`` file.
 
 Your next steps depend on your setup:
 

components/yaml/yaml_format.rst

@@ -223,7 +223,7 @@ YAML uses indentation with one or more spaces to describe nested collections:
       PHP:    5.2
       Propel: 1.3
 
-The following YAML is equivalent to the following PHP code:
+The above YAML is equivalent to the following PHP code:
 
 .. code-block:: php
 
@@ -240,7 +240,7 @@ The following YAML is equivalent to the following PHP code:
 
 There is one important thing you need to remember when using indentation in a
 YAML file: *Indentation must be done with one or more spaces, but never with
-tabulations*.
+tabulators*.
 
 You can nest sequences and mappings as you like:
 

cookbook/bundles/installation.rst

@@ -73,7 +73,7 @@ The only thing you need to do now is register the bundle in ``AppKernel``::
 
 In a few rare cases, you may want a bundle to be *only* enabled in the development
 :doc:`environment </cookbook/configuration/environments>`. For example,
-the DoctrineFixturesBundle helps load dummy data - something you probably
+the DoctrineFixturesBundle helps to load dummy data - something you probably
 only want to do while developing. To only load this bundle in the ``dev``
 and ``test`` environments, register the bundle in this way::
 

cookbook/validation/custom_constraint.rst

@@ -64,7 +64,7 @@ The validator class is also simple, and only has one required method ``validate(
     {
         public function validate($value, Constraint $constraint)
         {
-            if (!preg_match('/^[a-zA-Za0-9]+$/', $value, $matches)) {
+            if (!preg_match('/^[a-zA-Z0-9]+$/', $value, $matches)) {
                 // If you're using the new 2.5 validation API (you probably are!)
                 $this->context->buildViolation($constraint->message)
                     ->setParameter('%string%', $value)