Movatterモバイル変換


[0]ホーム

URL:


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

Sign up
Appearance settings

Commit305965d

Browse files
committed
Merge pull request#3143 from garak/patch-29
Update references to current branch
2 parents4b97990 +ef5c368 commit305965d

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

‎contributing/documentation/overview.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ Consistent with Symfony's source code, the documentation repository is split int
2929
multiple branches, corresponding to the different versions of Symfony itself.
3030
The ``master`` branch holds the documentation for the development branch of the code.
3131

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:
3535

3636
..code-block::bash
3737
38-
$ git checkout 2.2
38+
$ git checkout 2.3
3939
4040
..tip::
4141

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`
4343
that you'll use later.
4444

4545
Next, create a dedicated branch for your changes (for organization):
@@ -57,17 +57,17 @@ Creating a Pull Request
5757
Following the example, the pull request will default to be between your
5858
``improving_foo_and_bar`` branch and the ``symfony-docs`` ``master`` branch.
5959

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
6262
on the top left:
6363

6464
..image::/images/docs-pull-request-change-base.png
6565
:align:center
6666

6767
..note::
6868

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.
7171

7272
GitHub covers the topic of `pull requests`_ in detail.
7373

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp