Merge branch '7.0' into 7.1

* 7.0:
  [Security] Remove duplicated line
  Minor: remove duplicated lines
  Formatting typo
  [AssetMapper] Minor
  [Container] Missing link RST link begin
  Minor: remove duplicated lines

Author: javiereguiluz

components/dependency_injection.rst

@@ -178,7 +178,6 @@ You can override this behavior as follows::
     // the second argument is optional and defines what to do when the service doesn't exist
     $newsletterManager = $containerBuilder->get('newsletter_manager', ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE);
 
-
 These are all the possible behaviors:
 
  * ``ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE``: throws an exception

frontend/asset_mapper.rst

@@ -1012,8 +1012,8 @@ both ``app`` and ``checkout``:
 
     {# templates/products/checkout.html.twig #}
     {#
-        Override an "importmap" block in base.html.twig.
-        If you don't have this, add it around the {{ importmap('app') }} call.
+        Override an "importmap" block from base.html.twig.
+        If you don't have that block, add it around the {{ importmap('app') }} call.
     #}
     {% block importmap %}
         {# do NOT call parent() #}

migration.rst

@@ -340,7 +340,6 @@ somewhat like this::
             throw new \Exception("Unhandled legacy mapping for $requestPathInfo");
         }
 
-
         public static function handleRequest(Request $request, Response $response, string $publicDirectory): void
         {
             $legacyScriptFilename = LegacyBridge::getLegacyScript($request);

reference/configuration/framework.rst

@@ -2860,32 +2860,6 @@ annotation changes). For performance reasons, it is recommended to disable
 debug mode in production, which will happen automatically if you use the
 default value.
 
-secrets
-~~~~~~~
-
-decryption_env_var
-..................
-
-**type**: ``string`` **default**: ``base64:default::SYMFONY_DECRYPTION_SECRET``
-
-The environment variable that contains the decryption key.
-
-local_dotenv_file
-.................
-
-**type**: ``string`` **default**: ``%kernel.project_dir%/.env.%kernel.environment%.local``
-
-Path to an dotenv file that holds secrets. This is primarily used for testing.
-
-vault_directory
-...............
-
-**type**: ``string`` **default**: ``%kernel.project_dir%/config/secrets/%kernel.environment%``
-
-The directory where the vault of secrets is stored.
-
-.. _configuration-framework-serializer:
-
 serializer
 ~~~~~~~~~~
 

reference/configuration/security.rst

@@ -495,7 +495,6 @@ user logs out::
                         ->domain('example.com');
         };
 
-
 clear_site_data
 ...............
 

reference/constraints/Unique.rst

@@ -95,7 +95,6 @@ Options
 
 **type**: ``array`` | ``string``
 
-
 This is defines the key or keys in a collection that should be checked for
 uniqueness. By default, all collection keys are checked for uniqueness.
 

reference/constraints/UniqueEntity.rst

@@ -269,7 +269,7 @@ the combination value is unique (e.g. two users could have the same email,
 as long as they don't have the same name also).
 
 If you need to require two fields to be individually unique (e.g. a unique
-``email`` *and* a unique ``username``), you use two ``UniqueEntity`` entries,
+``email`` and a unique ``username``), you use two ``UniqueEntity`` entries,
 each with a single field.
 
 .. include:: /reference/constraints/_groups-option.rst.inc

security.rst

@@ -625,9 +625,6 @@ are public). On the other hand, all pages that you want to be *aware* of a logge
 user have to be under the same firewall. So if you want to display a *"You are logged in
 as ..."* message on every page, they all have to be included in the same firewall.
 
-The same firewall can have many modes of authentication. In other words, it
-enables many ways to ask the question *"Who are you?"*.
-
 You'll learn how to restrict access to URLs, controllers or
 anything else within your firewall in the :ref:`access control
 <security-access-control>` section.

service_container.rst

@@ -1367,7 +1367,7 @@ and ``site_update_manager.normal_users``. Thanks to the alias, if you type-hint
 ``SiteUpdateManager`` the first (``site_update_manager.superadmin``) will be passed.
 
 If you want to pass the second, you'll need to :ref:`manually wire the service <services-wire-specific-service>`
-or to create a named ref:`autowiring alias <autowiring-alias>`.
+or to create a named :ref:`autowiring alias <autowiring-alias>`.
 
 .. caution::
 

workflow/workflow-and-state-machine.rst

@@ -282,7 +282,6 @@ machine type, use ``camelCased workflow name + StateMachine``::
         // ...
     }
 
-
 Automatic and Manual Validation
 -------------------------------