Merge branch '2.0' into 2.1

Author: weaverryan

components/routing/introduction.rst

@@ -233,11 +233,11 @@ If you're using the ``YamlFileLoader``, then route definitions look like this:
     # routes.yml
     route1:
         pattern: /foo
-        defaults: { controller: 'MyController::fooAction' }
+        defaults: { _controller: 'MyController::fooAction' }
 
     route2:
         pattern: /foo/bar
-        defaults: { controller: 'MyController::foobarAction' }
+        defaults: { _controller: 'MyController::foobarAction' }
 
 To load this file, you can use the following code. This assumes that your
 ``routes.yml`` file is in the same directory as the below code::

reference/constraints/Type.rst

@@ -33,30 +33,30 @@ Basic Usage
 
     .. code-block:: php-annotations
 
-       // src/Acme/BlogBundle/Entity/Author.php
-       namespace Acme\BlogBundle\Entity;
-       
-       use Symfony\Component\Validator\Constraints as Assert;
-
-       class Author
-       {
-           /**
-            * @Assert\Type(type="integer", message="The value {{ value }} is not a valid {{ type }}.")
-            */
+        // src/Acme/BlogBundle/Entity/Author.php
+        namespace Acme\BlogBundle\Entity;
+
+        use Symfony\Component\Validator\Constraints as Assert;
+
+        class Author
+        {
+            /**
+             * @Assert\Type(type="integer", message="The value {{ value }} is not a valid {{ type }}.")
+             */
             protected $age;
-       }
+        }
 
    .. code-block:: xml
 
-       <!-- src/Acme/BlogBundle/Resources/config/validation.xml -->
-       <class name="Acme\BlogBundle\Entity\Author">
-           <property name="age">
-               <constraint name="Type">
-                   <option name="type">integer</option>
-                   <option name="message">The value {{ value }} is not a valid {{ type }}.</option>
-               </constraint>
-           </property>
-       </class>
+        <!-- src/Acme/BlogBundle/Resources/config/validation.xml -->
+        <class name="Acme\BlogBundle\Entity\Author">
+            <property name="age">
+                <constraint name="Type">
+                    <option name="type">integer</option>
+                    <option name="message">The value {{ value }} is not a valid {{ type }}.</option>
+                </constraint>
+            </property>
+        </class>
 
 Options
 -------
@@ -71,22 +71,22 @@ type
 This required option is the fully qualified class name or one of the PHP datatypes
 as determined by PHP's ``is_`` functions.
 
-  * `array <http://php.net/is_array>`_
-  * `bool <http://php.net/is_bool>`_
-  * `callable <http://php.net/is_callable>`_
-  * `float <http://php.net/is_float>`_ 
-  * `double <http://php.net/is_double>`_
-  * `int <http://php.net/is_int>`_ 
-  * `integer <http://php.net/is_integer>`_
-  * `long <http://php.net/is_long>`_
-  * `null <http://php.net/is_null>`_
-  * `numeric <http://php.net/is_numeric>`_
-  * `object <http://php.net/is_object>`_
-  * `real <http://php.net/is_real>`_
-  * `resource <http://php.net/is_resource>`_
-  * `scalar <http://php.net/is_scalar>`_
-  * `string <http://php.net/is_string>`_
-  
+* `array <http://php.net/is_array>`_
+* `bool <http://php.net/is_bool>`_
+* `callable <http://php.net/is_callable>`_
+* `float <http://php.net/is_float>`_
+* `double <http://php.net/is_double>`_
+* `int <http://php.net/is_int>`_
+* `integer <http://php.net/is_integer>`_
+* `long <http://php.net/is_long>`_
+* `null <http://php.net/is_null>`_
+* `numeric <http://php.net/is_numeric>`_
+* `object <http://php.net/is_object>`_
+* `real <http://php.net/is_real>`_
+* `resource <http://php.net/is_resource>`_
+* `scalar <http://php.net/is_scalar>`_
+* `string <http://php.net/is_string>`_
+
 message
 ~~~~~~~
 

reference/constraints/UniqueEntity.rst

@@ -81,7 +81,7 @@ Options
 fields
 ~~~~~~
 
-**type**: ``array``|``string`` [:ref:`default option<validation-default-option>`]
+**type**: ``array`` | ``string`` [:ref:`default option<validation-default-option>`]
 
 This required option is the field (or list of fields) on which this entity
 should be unique. For example, if you specified both the ``email`` and ``name``