Skip to content

Commit b21bd54

Browse files
committed
minor #17617 Bump Symfony version (kiler129)
This PR was merged into the 5.4 branch. Discussion ---------- Bump Symfony version Bump described symfony versions based on https://symfony.com/releases However, overall, shouldn't the docs be changed to direct users to check https://symfony.com/releases instead of hardcoding things like: > Nowadays this is the ``5.4`` branch. If you are instead documenting a new feature, switch to the first Symfony version that included it, e.g. ``upstream/6.2``. WDYT? Commits ------- 804f017 Bump Symfony version
2 parents 69a2d75 + 804f017 commit b21bd54

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

contributing/documentation/overview.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,16 +112,16 @@ memorable name for the new branch (if you are fixing a reported issue, use
112112

113113
.. code-block:: terminal
114114
115-
$ git checkout -b improve_install_article upstream/4.4
115+
$ git checkout -b improve_install_article upstream/5.4
116116
117117
In this example, the name of the branch is ``improve_install_article`` and the
118-
``upstream/4.4`` value tells Git to create this branch based on the ``4.4``
118+
``upstream/5.4`` value tells Git to create this branch based on the ``5.4``
119119
branch of the ``upstream`` remote, which is the original Symfony Docs repository.
120120

121121
Fixes should always be based on the **oldest maintained branch** which contains
122-
the error. Nowadays this is the ``4.4`` branch. If you are instead documenting a
122+
the error. Nowadays this is the ``5.4`` branch. If you are instead documenting a
123123
new feature, switch to the first Symfony version that included it, e.g.
124-
``upstream/5.4``.
124+
``upstream/6.2``.
125125

126126
**Step 5.** Now make your changes in the documentation. Add, tweak, reword and
127127
even remove any content and do your best to comply with the
@@ -155,7 +155,7 @@ changes should be applied:
155155
:align: center
156156

157157
In this example, the **base fork** should be ``symfony/symfony-docs`` and
158-
the **base** branch should be the ``4.4``, which is the branch that you selected
158+
the **base** branch should be the ``5.4``, which is the branch that you selected
159159
to base your changes on. The **head fork** should be your forked copy
160160
of ``symfony-docs`` and the **compare** branch should be ``improve_install_article``,
161161
which is the name of the branch you created and where you made your changes.
@@ -205,7 +205,7 @@ contribution to the Symfony docs:
205205
# create a new branch based on the oldest maintained version
206206
$ cd projects/symfony-docs/
207207
$ git fetch upstream
208-
$ git checkout -b my_changes upstream/4.4
208+
$ git checkout -b my_changes upstream/5.4
209209
210210
# ... do your changes
211211
@@ -254,8 +254,8 @@ into multiple branches, corresponding to the different versions of Symfony itsel
254254
The latest (e.g. ``5.x``) branch holds the documentation for the development branch of
255255
the code.
256256

257-
Unless you're documenting a feature that was introduced after Symfony 4.4,
258-
your changes should always be based on the ``4.4`` branch. Documentation managers
257+
Unless you're documenting a feature that was introduced after Symfony 5.4,
258+
your changes should always be based on the ``5.4`` branch. Documentation managers
259259
will use the necessary Git-magic to also apply your changes to all the active
260260
branches of the documentation.
261261

0 commit comments

Comments
 (0)