Merge branch '6.1' into 6.2

* 6.1:
  Fix: Build

Author: OskarStark

service_container/factories.rst

@@ -295,8 +295,8 @@ e.g. change the service based on a parameter:
         // config/services.php
         namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
-        use App\Email\NewsletterManagerInterface;
         use App\Email\NewsletterManagerFactory;
+        use App\Email\NewsletterManagerInterface;
 
         return function(ContainerConfigurator $containerConfigurator) {
             $services = $containerConfigurator->services();

translation.rst

@@ -860,9 +860,7 @@ of:
 
 * All the services that are tagged with ``kernel.locale_aware``;
 * ``\Locale::setDefault()``;
-* If a request is available, the ``_locale`` request attribute.
-
-.. code-block:: php
+* If a request is available, the ``_locale`` request attribute::
 
     use Symfony\Component\Translation\LocaleSwitcher;