Added information about branches, updated tip about merging times

bjo3rnf · bjo3rnf · commit 6a1f51457cee · 2012-11-06T10:28:18.000+01:00
diff --git a/contributing/documentation/overview.rst b/contributing/documentation/overview.rst
@@ -25,9 +25,14 @@ then clone your fork:
 
     $ git clone git://github.com/YOURUSERNAME/symfony-docs.git
 
+According to the framework's sources 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.
+
 Unless you're documenting a feature that's new to Symfony 2.1, your changes
-should be based on the 2.0 branch instead of the master branch. To do this
-checkout the 2.0 branch before the next step:
+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:
 
 .. code-block:: bash
 
@@ -53,6 +58,11 @@ the base branch to be 2.0 on the preview page:
 .. image:: /images/docs-pull-request-change-base.png
    :align: center
 
+.. note::
+
+  All changes made to the 2.0 branch will be merged into 2.1 which in turn will be
+  merged in to the master branch for the next release on a weekly base. 
+
 GitHub covers the topic of `pull requests`_ in detail.
 
 .. note::
@@ -62,11 +72,11 @@ GitHub covers the topic of `pull requests`_ in detail.
 
 .. tip::
 
-    Your changes appear on the symfony.com website no more than 15 minutes
-    after the documentation team merges your pull request. You can check if
-    your changes have introduced some markup issues by going to the
-    `Documentation Build Errors`_ page (it is updated each French night at 3AM
-    when the server rebuilds the documentation).
+    Please be patient. It can take from 15 minutes to several days for your changes
+    to appear on the symfony.com website after the documentation team merges your 
+    pull request. You can check if your changes have introduced some markup issues 
+    by going to the `Documentation Build Errors`_ page (it is updated each French 
+    night at 3AM when the server rebuilds the documentation).
 
 Standards
 ---------
