Skip to content

Commit 8788120

Browse files
committed
Merge branch '7.2' into 7.3
* 7.2: Fix Headings mentioned in #20716 fix: Add missing ContainerBuilder use statement in Bundle documentation Update overview.rst Add missing default value in the Twig reference
2 parents 8644781 + 5652ca5 commit 8788120

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

bundles/extension.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ class, you can define the :method:`Symfony\\Component\\HttpKernel\\Bundle\\Abstr
2525
method to load service definitions from configuration files::
2626

2727
// ...
28+
use Symfony\Component\DependencyInjection\ContainerBuilder;
2829
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
2930
use Symfony\Component\HttpKernel\Bundle\AbstractBundle;
3031

contributing/documentation/overview.rst

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

114114
.. code-block:: terminal
115115
116-
$ git checkout -b improve_install_article upstream/5.4
116+
$ git checkout -b improve_install_article upstream/6.4
117117
118118
In this example, the name of the branch is ``improve_install_article`` and the
119-
``upstream/5.4`` value tells Git to create this branch based on the ``5.4``
119+
``upstream/6.4`` value tells Git to create this branch based on the ``6.4``
120120
branch of the ``upstream`` remote, which is the original Symfony Docs repository.
121121

122122
Fixes should always be based on the **oldest maintained branch** which contains
123-
the error. Nowadays this is the ``5.4`` branch. If you are instead documenting a
123+
the error. Nowadays this is the ``6.4`` branch. If you are instead documenting a
124124
new feature, switch to the first Symfony version that included it, e.g.
125-
``upstream/6.2``.
125+
``upstream/7.2``.
126126

127127
**Step 5.** Now make your changes in the documentation. Add, tweak, reword and
128128
even remove any content and do your best to comply with the
@@ -156,7 +156,7 @@ changes should be applied:
156156
:alt: The base branch select option on the GitHub page.
157157

158158
In this example, the **base fork** should be ``symfony/symfony-docs`` and
159-
the **base** branch should be the ``5.4``, which is the branch that you selected
159+
the **base** branch should be the ``4.4``, which is the branch that you selected
160160
to base your changes on. The **head fork** should be your forked copy
161161
of ``symfony-docs`` and the **compare** branch should be ``improve_install_article``,
162162
which is the name of the branch you created and where you made your changes.
@@ -209,7 +209,7 @@ contribution to the Symfony docs:
209209
# create a new branch based on the oldest maintained version
210210
$ cd projects/symfony-docs/
211211
$ git fetch upstream
212-
$ git checkout -b my_changes upstream/5.4
212+
$ git checkout -b my_changes upstream/6.4
213213
214214
# ... do your changes
215215
@@ -258,8 +258,8 @@ into multiple branches, corresponding to the different versions of Symfony itsel
258258
The latest (e.g. ``5.x``) branch holds the documentation for the development branch of
259259
the code.
260260

261-
Unless you're documenting a feature that was introduced after Symfony 5.4,
262-
your changes should always be based on the ``5.4`` branch. Documentation managers
261+
Unless you're documenting a feature that was introduced after Symfony 6.4,
262+
your changes should always be based on the ``6.4`` branch. Documentation managers
263263
will use the necessary Git-magic to also apply your changes to all the active
264264
branches of the documentation.
265265

reference/configuration/security.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ The possible values of this option are:
157157
other session attributes are lost.
158158

159159
access_control
160-
--------------
160+
~~~~~~~~~~~~~~
161161

162162
Defines the security protection of the URLs of your application. It's used for
163163
example to trigger the user authentication when trying to access to the backend
@@ -166,7 +166,7 @@ and to allow unauthenticated users to the login form page.
166166
This option is explained in detail in :doc:`/security/access_control`.
167167

168168
firewalls
169-
---------
169+
~~~~~~~~~
170170

171171
This is arguably the most important option of the security config file. It
172172
defines the authentication mechanism used for each URL (or URL pattern) of your

reference/configuration/twig.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ mailer
279279
html_to_text_converter
280280
......................
281281

282-
**type**: ``string`` **default**: ````
282+
**type**: ``string`` **default**: ``null``
283283

284284
The service implementing
285285
:class:`Symfony\\Component\\Mime\\HtmlToTextConverter\\HtmlToTextConverterInterface`

0 commit comments

Comments
 (0)