diff --git a/bundles/extension.rst b/bundles/extension.rst index 0537eb00c3e..d2792efc477 100644 --- a/bundles/extension.rst +++ b/bundles/extension.rst @@ -25,6 +25,7 @@ class, you can define the :method:`Symfony\\Component\\HttpKernel\\Bundle\\Abstr method to load service definitions from configuration files:: // ... + use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use Symfony\Component\HttpKernel\Bundle\AbstractBundle; diff --git a/contributing/documentation/overview.rst b/contributing/documentation/overview.rst index 183910e6ac6..7095e4cbc4c 100644 --- a/contributing/documentation/overview.rst +++ b/contributing/documentation/overview.rst @@ -113,16 +113,16 @@ memorable name for the new branch (if you are fixing a reported issue, use .. code-block:: terminal - $ git checkout -b improve_install_article upstream/5.4 + $ git checkout -b improve_install_article upstream/6.4 In this example, the name of the branch is ``improve_install_article`` and the -``upstream/5.4`` value tells Git to create this branch based on the ``5.4`` +``upstream/6.4`` value tells Git to create this branch based on the ``6.4`` branch of the ``upstream`` remote, which is the original Symfony Docs repository. Fixes should always be based on the **oldest maintained branch** which contains -the error. Nowadays this is the ``5.4`` branch. If you are instead documenting a +the error. Nowadays this is the ``6.4`` branch. If you are instead documenting a new feature, switch to the first Symfony version that included it, e.g. -``upstream/6.2``. +``upstream/7.2``. **Step 5.** Now make your changes in the documentation. Add, tweak, reword and even remove any content and do your best to comply with the @@ -156,7 +156,7 @@ changes should be applied: :alt: The base branch select option on the GitHub page. In this example, the **base fork** should be ``symfony/symfony-docs`` and -the **base** branch should be the ``5.4``, which is the branch that you selected +the **base** branch should be the ``4.4``, which is the branch that you selected to base your changes on. The **head fork** should be your forked copy of ``symfony-docs`` and the **compare** branch should be ``improve_install_article``, which is the name of the branch you created and where you made your changes. @@ -209,7 +209,7 @@ contribution to the Symfony docs: # create a new branch based on the oldest maintained version $ cd projects/symfony-docs/ $ git fetch upstream - $ git checkout -b my_changes upstream/5.4 + $ git checkout -b my_changes upstream/6.4 # ... do your changes @@ -258,8 +258,8 @@ into multiple branches, corresponding to the different versions of Symfony itsel The latest (e.g. ``5.x``) branch holds the documentation for the development branch of the code. -Unless you're documenting a feature that was introduced after Symfony 5.4, -your changes should always be based on the ``5.4`` branch. Documentation managers +Unless you're documenting a feature that was introduced after Symfony 6.4, +your changes should always be based on the ``6.4`` branch. Documentation managers will use the necessary Git-magic to also apply your changes to all the active branches of the documentation. diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst index b3a75a6665d..9e338fffae4 100644 --- a/reference/configuration/security.rst +++ b/reference/configuration/security.rst @@ -157,7 +157,7 @@ The possible values of this option are: other session attributes are lost. access_control --------------- +~~~~~~~~~~~~~~ Defines the security protection of the URLs of your application. It's used for 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. This option is explained in detail in :doc:`/security/access_control`. firewalls ---------- +~~~~~~~~~ This is arguably the most important option of the security config file. It defines the authentication mechanism used for each URL (or URL pattern) of your diff --git a/reference/configuration/twig.rst b/reference/configuration/twig.rst index f46444ffdcc..3c4dc1b30ac 100644 --- a/reference/configuration/twig.rst +++ b/reference/configuration/twig.rst @@ -279,7 +279,7 @@ mailer html_to_text_converter ...................... -**type**: ``string`` **default**: ```` +**type**: ``string`` **default**: ``null`` The service implementing :class:`Symfony\\Component\\Mime\\HtmlToTextConverter\\HtmlToTextConverterInterface`