diff --git a/_build/maintainer_guide.rst b/_build/maintainer_guide.rst index 7e5cbc8caba..d7eefad8edc 100644 --- a/_build/maintainer_guide.rst +++ b/_build/maintainer_guide.rst @@ -39,14 +39,14 @@ contributes again, it's OK to mention some of the minor issues to educate them. $ gh merge 11059 - Working on symfony/symfony-docs (branch master) + Working on symfony/symfony-docs (branch 4.4) Merging Pull Request 11059: dmaicher/patch-3 ... # This is important!! Say NO to push the changes now Push the changes now? (Y/n) n - Now, push with: git push gh "master" refs/notes/github-comments + Now, push with: git push gh "4.4" refs/notes/github-comments # Now, open your editor and make the needed changes ... @@ -54,7 +54,7 @@ contributes again, it's OK to mention some of the minor issues to educate them. # Use "Minor reword", "Minor tweak", etc. as the commit message # now run the 'push' command shown above by 'gh' (it's different each time) - $ git push gh "master" refs/notes/github-comments + $ git push gh "4.4" refs/notes/github-comments Merging Pull Requests --------------------- diff --git a/contributing/code/maintenance.rst b/contributing/code/maintenance.rst index e03c22cabf3..caca1b54759 100644 --- a/contributing/code/maintenance.rst +++ b/contributing/code/maintenance.rst @@ -41,14 +41,14 @@ Besides bug fixes, other minor changes can be accepted in a patch version: * **Coding standard and refactoring**: Coding standard fixes or code refactoring are not recommended but can be accepted for consistency with the - existing code base, if they are not too invasive, and if merging them on - master would not lead to complex branch merging; + existing code base, if they are not too invasive, and if merging them into + higher branches would not lead to complex branch merging; * **Tests**: Tests that increase the code coverage can be added. Anything not explicitly listed above should be done on the next minor or major -version instead (aka the *master* branch). For instance, the following changes -are never accepted in a patch version: +version instead. For instance, the following changes are never accepted in a +patch version: * **New features**; diff --git a/contributing/documentation/format.rst b/contributing/documentation/format.rst index 1f6f1787918..297db06adf2 100644 --- a/contributing/documentation/format.rst +++ b/contributing/documentation/format.rst @@ -201,9 +201,9 @@ For a deprecation use the ``.. deprecated:: 4.x`` directive: Not passing the root node name to ``TreeBuilder`` was deprecated in Symfony 4.2. Whenever a new major version of Symfony is released (e.g. 5.0, 6.0, etc), -a new branch of the documentation is created from the ``master`` branch. -At this point, all the ``versionadded`` and ``deprecated`` tags for Symfony -versions that have a lower major version will be removed. For example, if +a new branch of the documentation is created from the x.4 branch of the previous +major version. At this point, all the ``versionadded`` and ``deprecated`` tags for +Symfony versions that have a lower major version will be removed. For example, if Symfony 5.0 were released today, 4.0 to 4.4 ``versionadded`` and ``deprecated`` tags would be removed from the new ``5.0`` branch.