Skip to content

Commit 700f72d

Browse files
committed
Merge branch '2.0' into 2.1
2 parents dc9cb77 + 3c837d2 commit 700f72d

File tree

4 files changed

+6
-17
lines changed

4 files changed

+6
-17
lines changed

components/config/definition.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,8 +375,8 @@ an array with with ``fixXmlConfig``.
375375

376376
You can further control the normalization process if you need to. For example,
377377
you may want to allow a string to be set and used as a particular key or several
378-
keys to be set explicitly. So that, if everything apart from id is optional in this
379-
config:
378+
keys to be set explicitly. So that, if everything apart from ``name`` is optional
379+
in this config:
380380

381381
.. code-block:: yaml
382382

contributing/code/patches.rst

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Get the Symfony2 source code:
7878
7979
$ git clone git@github.com:USERNAME/symfony.git
8080
81-
* Add the upstream repository as ``remote``:
81+
* Add the upstream repository as a remote:
8282

8383
.. code-block:: bash
8484
@@ -292,7 +292,6 @@ An example submission could now look as follows:
292292
Bug fix: no
293293
Feature addition: yes
294294
Backwards compatibility break: no
295-
Symfony2 tests pass: yes
296295
Fixes the following tickets: #12, #43
297296
Todo: -
298297
License of the code: MIT
@@ -350,17 +349,6 @@ When you save, git will start rebasing, and if successful, will ask you to
350349
edit the commit message, which by default is a listing of the commit messages
351350
of all the commits. When you finish, execute the push command.
352351

353-
.. tip::
354-
355-
To automatically get your feature branch tested, you can add your fork to
356-
`travis-ci.org`_. Just login using your github.com account and then simply
357-
flip a single switch to enable automated testing. In your pull request,
358-
instead of specifying "*Symfony2 tests pass: [yes|no]*", you can link to
359-
the `travis-ci.org status icon`_. For more details, see the
360-
`travis-ci.org Getting Started Guide`_. This could easily be done by clicking
361-
on the wrench icon on the build page of Travis. First select your feature
362-
branch and then copy the markdown to your PR description.
363-
364352
.. _ProGit: http://git-scm.com/book
365353
.. _GitHub: https://github.com/signup/free
366354
.. _`Github's Documentation`: https://help.github.com/articles/ignoring-files

contributing/code/standards.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ example containing most features described below:
4040
private $fooBar;
4141

4242
/**
43-
* @param string $dummyy Some argument description
43+
* @param string $dummy Some argument description
4444
*/
4545
public function __construct($dummy)
4646
{
@@ -49,6 +49,7 @@ example containing most features described below:
4949
5050
/**
5151
* @param string $dummy Some argument description
52+
* @param array $options
5253
*
5354
* @return string|null Transformed input
5455
*/

reference/dic_tags.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ For simplicity, you'll often extend an
8888
the interface directly::
8989

9090
// src/Acme/MainBundle/Form/Type/MyFormTypeExtension.php
91-
namespace Acme\MainBundle\Form\Type\MyFormTypeExtension;
91+
namespace Acme\MainBundle\Form\Type;
9292

9393
use Symfony\Component\Form\AbstractTypeExtension;
9494

0 commit comments

Comments
 (0)