Merge branch '2.0' into 2.1

Author: weaverryan

book/forms.rst

@@ -1468,7 +1468,7 @@ But sometimes, you may just want to use a form without a class, and get back
 an array of the submitted data. This is actually really easy::
 
     // make sure you've imported the Request namespace above the class
-    use Symfony\Component\HttpFoundation\Request
+    use Symfony\Component\HttpFoundation\Request;
     // ...
 
     public function contactAction(Request $request)

contributing/code/patches.rst

@@ -279,6 +279,7 @@ your contributions can be included into Symfony2 as quickly as possible:
     Bug fix: [yes|no]
     Feature addition: [yes|no]
     Backwards compatibility break: [yes|no]
+    Deprecations: [what, when|no]
     Symfony2 tests pass: [yes|no]
     Fixes the following tickets: [comma separated list of tickets fixed by the PR]
     Todo: [list of todos pending]

cookbook/form/form_collections.rst

@@ -63,8 +63,8 @@ objects. Start by creating a simple ``Task`` class::
 .. note::
 
     The ``ArrayCollection`` is specific to Doctrine and is basically the
-    same as using an ``array`` (but it must be an ``ArrayCollection``) if
-    you're using Doctrine.
+    same as using an ``array`` (but it must be an ``ArrayCollection`` if
+    you're using Doctrine).
 
 Now, create a ``Tag`` class. As you saw above, a ``Task`` can have many ``Tag``
 objects::