From e30823309d695d4cea6e2c2c4c04b85e3640e903 Mon Sep 17 00:00:00 2001 From: Wouter J Date: Sun, 14 Oct 2012 20:34:25 +0300 Subject: [PATCH 1/2] Updated README file with the new branch There is a new `2.1` branch for some months now, we should update the README file to include this branch (and new features). --- README.markdown | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.markdown b/README.markdown index 5e5a5363921..1fbad0305eb 100644 --- a/README.markdown +++ b/README.markdown @@ -7,8 +7,9 @@ Contributing ------------ >**Note** ->Unless you're documenting a feature that's new to Symfony 2.1, all pull ->requests must be based off of the **2.0** branch, **not** the master branch. +>Unless you're documenting a feature that's new to a subversion of Symfony 2, +>all pull requests must be based off of the **2.0** branch, **not** the master +>or 2.1 branch. We love contributors! For more information on how you can contribute to the Symfony documentation, please read [Contributing to the Documentation](http://symfony.com/doc/current/contributing/documentation/overview.html) From fecf51f6f97ecde9a10d17c626e5427b2af334d7 Mon Sep 17 00:00:00 2001 From: Wouter J Date: Thu, 18 Oct 2012 17:03:26 +0300 Subject: [PATCH 2/2] Corrected sentence mentioned by @weaverryan --- README.markdown | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.markdown b/README.markdown index 1fbad0305eb..afa5925f03f 100644 --- a/README.markdown +++ b/README.markdown @@ -7,9 +7,10 @@ Contributing ------------ >**Note** ->Unless you're documenting a feature that's new to a subversion of Symfony 2, ->all pull requests must be based off of the **2.0** branch, **not** the master ->or 2.1 branch. +>Unless you're documenting a feature that's new to a specific version of Symfony +>(e.g. Symfony 2.1), all pull requests must be based off of the **2.0** branch, +>**not** the master or 2.1 branch. We love contributors! For more information on how you can contribute to the -Symfony documentation, please read [Contributing to the Documentation](http://symfony.com/doc/current/contributing/documentation/overview.html) +Symfony documentation, please read +[Contributing to the Documentation](http://symfony.com/doc/current/contributing/documentation/overview.html)