Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 9486baf

Browse filesBrowse files
committed
Merge pull request symfony#2282 from symfony/doc-contributing-version-bump
[2.0] Re-working contributing language for 2.2 branch
2 parents 60e03c7 + b9dbf81 commit 9486baf
Copy full SHA for 9486baf

File tree

Expand file treeCollapse file tree

1 file changed

+13
-6
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+13
-6
lines changed

‎contributing/documentation/overview.rst

Copy file name to clipboardExpand all lines: contributing/documentation/overview.rst
+13-6Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,23 @@ then clone your fork:
2626
$ git clone git://github.com/YOURUSERNAME/symfony-docs.git
2727
2828
Consistent with Symfony's source code, the documentation repository is split into
29-
three branches: ``2.0`` for the current Symfony 2.0.x release, ``2.1`` for the
30-
current Symfony 2.1.x release and ``master`` as the development branch for
31-
upcoming releases.
29+
multiple branches: ``2.0``, ``2.1``, ``2.2`` corresponding to the different
30+
versions of Symfony itself. The ``master`` branch holds the documentation
31+
for the development branch of the code.
3232

33-
Unless you're documenting a feature that's new to Symfony 2.1, your changes
34-
should always be based on the 2.0 branch instead of the master branch. To do
35-
this checkout the 2.0 branch before the next step:
33+
Unless you're documenting a feature that was introduced *after* Symfony 2.0
34+
(e.g. in Symfony 2.1), your changes should always be based on the 2.0 branch.
35+
To do this checkout the 2.0 branch before the next step:
3636

3737
.. code-block:: bash
3838
3939
$ git checkout 2.0
4040
41+
.. tip::
42+
43+
Your base branch (e.g. 2.0) will become the "Applies to" in the :ref:`doc-contributing-pr-format`
44+
that you'll use later.
45+
4146
Next, create a dedicated branch for your changes (for organization):
4247

4348
.. code-block:: bash
@@ -74,6 +79,8 @@ GitHub covers the topic of `pull requests`_ in detail.
7479
The Symfony2 documentation is licensed under a Creative Commons
7580
Attribution-Share Alike 3.0 Unported :doc:`License <license>`.
7681

82+
.. _doc-contributing-pr-format:
83+
7784
Pull Request Format
7885
~~~~~~~~~~~~~~~~~~~
7986

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.