@@ -29,17 +29,17 @@ Consistent with Symfony's source code, the documentation repository is split int
29
29
multiple branches, corresponding to the different versions of Symfony itself.
30
30
The ``master `` branch holds the documentation for the development branch of the code.
31
31
32
- Unless you're documenting a feature that was introduced *after * Symfony 2.2
33
- (e.g. in Symfony 2.3 ), your changes should always be based on the 2.2 branch.
34
- To do this checkout the 2.2 branch before the next step:
32
+ Unless you're documenting a feature that was introduced *after * Symfony 2.3
33
+ (e.g. in Symfony 2.4 ), your changes should always be based on the 2.3 branch.
34
+ To do this checkout the 2.3 branch before the next step:
35
35
36
36
.. code-block :: bash
37
37
38
- $ git checkout 2.2
38
+ $ git checkout 2.3
39
39
40
40
.. tip ::
41
41
42
- Your base branch (e.g. 2.2 ) will become the "Applies to" in the :ref: `doc-contributing-pr-format `
42
+ Your base branch (e.g. 2.3 ) will become the "Applies to" in the :ref: `doc-contributing-pr-format `
43
43
that you'll use later.
44
44
45
45
Next, create a dedicated branch for your changes (for organization):
@@ -57,17 +57,17 @@ Creating a Pull Request
57
57
Following the example, the pull request will default to be between your
58
58
``improving_foo_and_bar `` branch and the ``symfony-docs `` ``master `` branch.
59
59
60
- If you have made your changes based on the 2.2 branch then you need to change
61
- the base branch to be 2.2 on the preview page by clicking the ``edit `` button
60
+ If you have made your changes based on the 2.3 branch then you need to change
61
+ the base branch to be 2.3 on the preview page by clicking the ``edit `` button
62
62
on the top left:
63
63
64
64
.. image :: /images/docs-pull-request-change-base.png
65
65
:align: center
66
66
67
67
.. note ::
68
68
69
- All changes made to a branch (e.g. 2.2 ) will be merged up to each "newer"
70
- branch (e.g. 2.3 , master, etc) for the next release on a weekly basis.
69
+ All changes made to a branch (e.g. 2.3 ) will be merged up to each "newer"
70
+ branch (e.g. 2.4 , master, etc) for the next release on a weekly basis.
71
71
72
72
GitHub covers the topic of `pull requests `_ in detail.
73
73
0 commit comments