Skip to content

remove outdated references to the master branch #16887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 17, 2022
Merged

remove outdated references to the master branch #16887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions _build/maintainer_guide.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,22 @@ 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 ...

$ git commit -a
# 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
---------------------
Expand Down
8 changes: 4 additions & 4 deletions contributing/code/maintenance.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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**;

Expand Down
6 changes: 3 additions & 3 deletions contributing/documentation/format.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down