Merge branch '3.4' into 4.0

* 3.4:
  Formatting: Apply PSR-2 formatting to code example
  Update conventions.rst
  Small grammar update in HttpFoundation

Author: javiereguiluz

components/http_foundation.rst

@@ -474,7 +474,7 @@ represented by a PHP callable instead of a string::
 
     Additionally, PHP isn't the only layer that can buffer output. Your web
     server might also buffer based on its configuration. Some servers, such as
-    Nginx, let you disable buffering at config level or adding a special HTTP
+    Nginx, let you disable buffering at the config level or by adding a special HTTP
     header in the response::
 
         // disables FastCGI buffering in Nginx only for this response

contributing/code/conventions.rst

@@ -26,7 +26,7 @@ When an object has a "main" many relation with related "things"
 * ``count()``
 * ``keys()``
 
-The usage of these methods are only allowed when it is clear that there
+The usage of these methods is only allowed when it is clear that there
 is a main relation:
 
 * a ``CookieJar`` has many ``Cookie`` objects;

doctrine/registration_form.rst

@@ -99,7 +99,8 @@ With some validation added, your class may look something like this::
          */
         private $roles;
 
-        public function __construct() {
+        public function __construct()
+        {
             $this->roles = array('ROLE_USER');
         }