Skip to content

Commit 1d96312

Browse files
committed
Merge branch '7.0' into 7.1
* 7.0: - use option name as link label
2 parents ef06143 + a1ab5fd commit 1d96312

File tree

3 files changed

+1
-9
lines changed

3 files changed

+1
-9
lines changed

bundles/configuration.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,6 @@ There are two different ways of creating friendly configuration for a bundle:
6161
Using the AbstractBundle Class
6262
------------------------------
6363

64-
.. versionadded:: 6.1
65-
66-
The ``AbstractBundle`` class was introduced in Symfony 6.1.
67-
6864
In bundles extending the :class:`Symfony\\Component\\HttpKernel\\Bundle\\AbstractBundle`
6965
class, you can add all the logic related to processing the configuration in that class::
7066

bundles/extension.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ There are two different ways of doing it:
2020
Loading Services Directly in your Bundle Class
2121
----------------------------------------------
2222

23-
.. versionadded:: 6.1
24-
25-
The ``AbstractBundle`` class was introduced in Symfony 6.1.
26-
2723
In bundles extending the :class:`Symfony\\Component\\HttpKernel\\Bundle\\AbstractBundle`
2824
class, you can define the :method:`Symfony\\Component\\HttpKernel\\Bundle\\AbstractBundle::loadExtension`
2925
method to load service definitions from configuration files::

forms.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,7 @@ to the ``form()`` or the ``form_start()`` helper functions:
773773
that stores this method. The form will be submitted in a normal ``POST``
774774
request, but :doc:`Symfony's routing </routing>` is capable of detecting the
775775
``_method`` parameter and will interpret it as a ``PUT``, ``PATCH`` or
776-
``DELETE`` request. The :ref:`configuration-framework-http_method_override`
776+
``DELETE`` request. The :ref:`http_method_override <configuration-framework-http_method_override>`
777777
option must be enabled for this to work.
778778

779779
Changing the Form Name

0 commit comments

Comments
 (0)