Merge pull request symfony#2282 from symfony/doc-contributing-version-bump

weaverryan · weaverryan · commit 9486bafef5cd · 2013-03-14T18:56:45.000-07:00
[2.0] Re-working contributing language for 2.2 branch
diff --git a/contributing/documentation/overview.rst b/contributing/documentation/overview.rst
@@ -26,18 +26,23 @@ then clone your fork:
     $ git clone git://github.com/YOURUSERNAME/symfony-docs.git
 
 Consistent with Symfony's source code, the documentation repository is split into
-three branches: ``2.0`` for the current Symfony 2.0.x release, ``2.1`` for the
-current Symfony 2.1.x release and ``master`` as the development branch for
-upcoming releases.
+multiple branches: ``2.0``, ``2.1``, ``2.2`` corresponding to the different
+versions of Symfony itself. The ``master`` branch holds the documentation
+for the development branch of the code.
 
-Unless you're documenting a feature that's new to Symfony 2.1, your changes
-should always be based on the 2.0 branch instead of the master branch. To do
-this checkout the 2.0 branch before the next step:
+Unless you're documenting a feature that was introduced *after* Symfony 2.0
+(e.g. in Symfony 2.1), your changes should always be based on the 2.0 branch.
+To do this checkout the 2.0 branch before the next step:
 
 .. code-block:: bash
 
     $ git checkout 2.0
 
+.. tip::
+
+    Your base branch (e.g. 2.0) will become the "Applies to" in the :ref:`doc-contributing-pr-format`
+    that you'll use later.
+
 Next, create a dedicated branch for your changes (for organization):
 
 .. code-block:: bash
@@ -74,6 +79,8 @@ GitHub covers the topic of `pull requests`_ in detail.
     The Symfony2 documentation is licensed under a Creative Commons
     Attribution-Share Alike 3.0 Unported :doc:`License <license>`.
 
+.. _doc-contributing-pr-format:
+
 Pull Request Format
 ~~~~~~~~~~~~~~~~~~~
 
