Merge branch '2.2' into 2.3

Conflicts:
	cookbook/security/entity_provider.rst
	reference/forms/types/options/disabled.rst.inc

Author: weaverryan

README.markdown

@@ -8,9 +8,9 @@ Contributing
 
 >**Note**
 >Unless you're documenting a feature that's new to a specific version of Symfony
->(e.g. Symfony 2.3), all pull requests must be based off of the **2.2** branch, 
+>(e.g. Symfony 2.3), all pull requests must be based off of the **2.2** branch,
 >**not** the master or 2.3 branch.
 
 We love contributors! For more information on how you can contribute to the
-Symfony documentation, please read 
-[Contributing to the Documentation](http://symfony.com/doc/current/contributing/documentation/overview.html) 
+Symfony documentation, please read
+[Contributing to the Documentation](http://symfony.com/doc/current/contributing/documentation/overview.html)

book/forms.rst

@@ -1360,7 +1360,7 @@ form with many ``Product`` sub-forms). This is done by using the ``collection``
 field type.
 
 For more information see the ":doc:`/cookbook/form/form_collections`" cookbook
-entry and  the :doc:`collection </reference/forms/types/collection>` field type reference.
+entry and the :doc:`collection </reference/forms/types/collection>` field type reference.
 
 .. index::
    single: Forms; Theming

book/installation.rst

@@ -135,7 +135,7 @@ Updating Vendors
 
 At this point, you've downloaded a fully-functional Symfony project in which
 you'll start to develop your own application. A Symfony project depends on
-a number of external libraries. These are downloaded into the `vendor/` directory
+a number of external libraries. These are downloaded into the ``vendor/`` directory
 of your project via a library called `Composer`_.
 
 Depending on how you downloaded Symfony, you may or may not need to update

book/page_creation.rst

@@ -42,10 +42,10 @@ also load specific bundles based on the selected environment. For example,
 Symfony2 comes with the WebProfilerBundle (described below), enabled only
 in the ``dev`` and ``test`` environments.
 
-Symfony2 comes with two web-accessible front controllers: ``app_dev.php`` 
+Symfony2 comes with two web-accessible front controllers: ``app_dev.php``
 provides the ``dev`` environment, and ``app.php`` provides the ``prod`` environment.
 All web accesses to Symfony2 normally go through one of these front controllers.
-(The ``test`` environment is normally only used when running unit tests, and so 
+(The ``test`` environment is normally only used when running unit tests, and so
 doesn't have a dedicated front controller. The console tool also provides a
 front controller that can be used with any environment.)
 
@@ -555,7 +555,7 @@ You'll learn more about each of these directories in later chapters.
 
     When Symfony is loading, a special file - ``vendor/autoload.php`` - is
     included. This file is created by Composer and will autoload all
-    application files living in the `src/` folder as well as all
+    application files living in the ``src/`` folder as well as all
     third-party libraries mentioned in the ``composer.json`` file.
 
     Because of the autoloader, you never need to worry about using ``include``
@@ -864,7 +864,7 @@ Default Configuration Dump
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You can dump the default configuration for a bundle in YAML to the console using
-the ``config:dump-reference`` command.  Here is an example of dumping the default
+the ``config:dump-reference`` command. Here is an example of dumping the default
 FrameworkBundle configuration:
 
 .. code-block:: bash

book/propel.rst

@@ -134,7 +134,7 @@ Creating the Database Tables/Schema
 Now you have a usable ``Product`` class and all you need to persist it. Of
 course, you don't yet have the corresponding ``product`` table in your
 database. Fortunately, Propel can automatically create all the database tables
-needed for every known model in your application.  To do this, run:
+needed for every known model in your application. To do this, run:
 
 .. code-block:: bash
 
@@ -153,7 +153,7 @@ Persisting Objects to the Database
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Now that you have a ``Product`` object and corresponding ``product`` table,
-you're ready to persist data to the database.  From inside a controller, this
+you're ready to persist data to the database. From inside a controller, this
 is pretty easy. Add the following method to the ``DefaultController`` of the
 bundle::
 
@@ -406,7 +406,7 @@ Fetching Related Objects
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
 When you need to fetch associated objects, your workflow looks just like it did
-before.  First, fetch a ``$product`` object and then access its related
+before. First, fetch a ``$product`` object and then access its related
 ``Category``::
 
     // ...
@@ -435,7 +435,7 @@ Lifecycle Callbacks
 -------------------
 
 Sometimes, you need to perform an action right before or after an object is
-inserted, updated, or deleted.  These types of actions are known as "lifecycle"
+inserted, updated, or deleted. These types of actions are known as "lifecycle"
 callbacks or "hooks", as they're callback methods that you need to execute
 during different stages of the lifecycle of an object (e.g. the object is
 inserted, updated, deleted, etc).

book/templating.rst

@@ -1091,7 +1091,7 @@ Global Template Variables
 -------------------------
 
 During each request, Symfony2 will set a global template variable ``app``
-in both Twig and PHP template engines by default.  The ``app`` variable
+in both Twig and PHP template engines by default. The ``app`` variable
 is a :class:`Symfony\\Bundle\\FrameworkBundle\\Templating\\GlobalVariables`
 instance which will give you access to some application specific variables
 automatically:

book/testing.rst

@@ -478,7 +478,7 @@ Redirecting
 
 When a request returns a redirect response, the client does not follow
 it automatically. You can examine the response and force a redirection
-afterwards  with the ``followRedirect()`` method::
+afterwards with the ``followRedirect()`` method::
 
     $crawler = $client->followRedirect();
 

book/validation.rst

@@ -169,7 +169,7 @@ You could also pass the collection of errors into a template.
         return $this->render('AcmeBlogBundle:Author:validate.html.twig', array(
             'errors' => $errors,
         ));
-    } 
+    }
 
 Inside the template, you can output the list of errors exactly as needed:
 

components/class_loader/cache_class_loader.rst

@@ -20,8 +20,8 @@ for a class.
 
 .. note::
 
-  Both the ``ApcClassLoader`` and the ``XcacheClassLoader`` can be used
-  to cache Composer's `autoloader`_.
+    Both the ``ApcClassLoader`` and the ``XcacheClassLoader`` can be used
+    to cache Composer's `autoloader`_.
 
 ApcClassLoader
 --------------

components/class_loader/class_loader.rst

@@ -81,4 +81,4 @@ or one of its children, the autoloader will first look for the class under the
 of the prefix registrations is significant in this case.
 
 .. _PEAR:  http://pear.php.net/manual/en/standards.naming.php
-.. _PSR-0: http://symfony.com/PSR0
+.. _PSR-0: http://www.php-fig.org/psr/psr-0/