Merge branch '2.0' into 2.1

components/config/definition.rst

@@ -375,8 +375,8 @@ an array with with ``fixXmlConfig``.
 
 You can further control the normalization process if you need to. For example,
 you may want to allow a string to be set and used as a particular key or several
-keys to be set explicitly. So that, if everything apart from id is optional in this
-config:
+keys to be set explicitly. So that, if everything apart from ``name`` is optional
+in this config:
 
 .. code-block:: yaml
 

contributing/code/patches.rst

@@ -78,7 +78,7 @@ Get the Symfony2 source code:
 
       $ git clone git@github.com:USERNAME/symfony.git
 
-* Add the upstream repository as ``remote``:
+* Add the upstream repository as a remote:
 
 .. code-block:: bash
 
@@ -292,7 +292,6 @@ An example submission could now look as follows:
     Bug fix: no
     Feature addition: yes
     Backwards compatibility break: no
-    Symfony2 tests pass: yes
     Fixes the following tickets: #12, #43
     Todo: -
     License of the code: MIT
@@ -350,17 +349,6 @@ When you save, git will start rebasing, and if successful, will ask you to
 edit the commit message, which by default is a listing of the commit messages
 of all the commits. When you finish, execute the push command.
 
-.. tip::
-
-    To automatically get your feature branch tested, you can add your fork to
-    `travis-ci.org`_. Just login using your github.com account and then simply
-    flip a single switch to enable automated testing. In your pull request,
-    instead of specifying "*Symfony2 tests pass: [yes|no]*", you can link to
-    the `travis-ci.org status icon`_. For more details, see the
-    `travis-ci.org Getting Started Guide`_. This could easily be done by clicking
-    on the wrench icon on the build page of Travis. First select your feature
-    branch and then copy the markdown to your PR description.
-
 .. _ProGit:                                http://git-scm.com/book
 .. _GitHub:                                https://github.com/signup/free
 .. _`Github's Documentation`:              https://help.github.com/articles/ignoring-files

contributing/code/standards.rst

@@ -40,7 +40,7 @@ example containing most features described below:
         private $fooBar;
 
         /**
-         * @param string $dummyy Some argument description
+         * @param string $dummy Some argument description
          */
         public function __construct($dummy)
         {
@@ -49,6 +49,7 @@ example containing most features described below:
 
         /**
          * @param string $dummy Some argument description
+         * @param array $options
          *
          * @return string|null Transformed input
          */

reference/dic_tags.rst

@@ -88,7 +88,7 @@ For simplicity, you'll often extend an
 the interface directly::
 
     // src/Acme/MainBundle/Form/Type/MyFormTypeExtension.php
-    namespace Acme\MainBundle\Form\Type\MyFormTypeExtension;
+    namespace Acme\MainBundle\Form\Type;
 
     use Symfony\Component\Form\AbstractTypeExtension;