diff --git a/components/mime.rst b/components/mime.rst
index 34b06cd40de..62bb707ebdb 100644
--- a/components/mime.rst
+++ b/components/mime.rst
@@ -156,7 +156,7 @@ images inside the HTML contents::
         ->embed(fopen('/path/to/images/logo.png', 'r'), 'logo')
         ->embedFromPath('/path/to/images/signature.gif', 'footer-signature')
         // reference images using the syntax 'cid:' + "image embed name"
-        ->html('<img src="cid:logo" /> ... <img src="cid:footer-signature" /> ...')
+        ->html('<img src="cid:logo"/> ... <img src="cid:footer-signature"/> ...')
     ;
 
 File Attachments
@@ -251,7 +251,7 @@ email multiparts::
 
     $textContent = new TextPart('Lorem ipsum...');
     $htmlContent = new TextPart(sprintf(
-        '<img src="cid:%s" /> <h1>Lorem ipsum</h1> <p>...</p>', $imageCid
+        '<img src="cid:%s"/> <h1>Lorem ipsum</h1> <p>...</p>', $imageCid
     ), 'html');
     $bodyContent = new AlternativePart($textContent, $htmlContent);
     $body = new RelatedPart($bodyContent, $embeddedImage);
@@ -390,7 +390,7 @@ the ``TemplatedEmail`` class::
 Embedding Images in Emails with Twig
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Instead of dealing with the ``<img src="cid: ..." />`` syntax explained in the
+Instead of dealing with the ``<img src="cid: ..."/>`` syntax explained in the
 previous sections, when using Twig to render email contents you can refer to
 image files as usual. First, define a Twig namespace called ``images`` to
 simplify things later::
@@ -407,7 +407,7 @@ the email contents:
 .. code-block:: html+twig
 
     {# '@images/' refers to the Twig namespace defined earlier #}
-    <img src="{{ email.image('@images/logo.png') }}" />
+    <img src="{{ email.image('@images/logo.png') }}"/>
 
     <h1>Welcome {{ username }}!</h1>
     {# ... #}
@@ -495,7 +495,7 @@ Now, enable the extension (this is done automatically in Symfony applications)::
 Finally, use the ``markdown`` filter to convert parts or the entire email
 contents from Markdown to HTML:
 
-.. code-block:: html+twig
+.. code-block:: twig
 
     {% filter markdown %}
         Welcome {{ username }}!
@@ -560,7 +560,7 @@ contents from Inky to HTML:
 
 You can combine all filters to create complex email messages:
 
-.. code-block:: html+twig
+.. code-block:: twig
 
     {% filter inky|inline_css(source('@zurb/stylesheets/main.css')) %}
         {# ... #}
diff --git a/components/property_access.rst b/components/property_access.rst
index e0b13a6dca8..c362da2da22 100644
--- a/components/property_access.rst
+++ b/components/property_access.rst
@@ -176,7 +176,7 @@ Accessing a non Existing Property Path
 
 By default a :class:`Symfony\\Component\\PropertyAccess\\Exception\\NoSuchPropertyException`
 is thrown if the property path passed to :method:`PropertyAccessor::getValue<Symfony\\Component\\PropertyAccess\\PropertyAccessor::getValue>`
-does not exist. You can change this behaviour using the
+does not exist. You can change this behavior using the
 :method:`Symfony\\Component\\PropertyAccess\\PropertyAccessorBuilder::disableExceptionOnInvalidPropertyPath`
 method::
 
diff --git a/components/routing.rst b/components/routing.rst
index 4bd5297e858..2eaf0fbf294 100644
--- a/components/routing.rst
+++ b/components/routing.rst
@@ -482,7 +482,7 @@ routes with UTF-8 characters:
             <routes xmlns="http://symfony.com/schema/routing"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xsi:schemaLocation="http://symfony.com/schema/routing
-                    http://symfony.com/schema/routing/routing-1.0.xsd">
+                    https://symfony.com/schema/routing/routing-1.0.xsd">
 
                 <route id="route1"
                     path="/category/{name}"
diff --git a/configuration/environment_variables.rst b/configuration/environment_variables.rst
index d10786d9961..09a67f6dc66 100644
--- a/configuration/environment_variables.rst
+++ b/configuration/environment_variables.rst
@@ -626,7 +626,7 @@ Symfony provides the following env var processors:
             <container xmlns="http://symfony.com/schema/dic/services"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xsi:schemaLocation="http://symfony.com/schema/dic/services
-                    http://symfony.com/schema/dic/services/services-1.0.xsd">
+                    https://symfony.com/schema/dic/services/services-1.0.xsd">
 
                 <mongodb:config>
                     <mongodb:client name="default" username="%env(key:user:url:MONGODB_URL)%" password="%env(key:pass:url:MONGODB_URL)%">
@@ -695,7 +695,7 @@ Symfony provides the following env var processors:
             <container xmlns="http://symfony.com/schema/dic/services"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xsi:schemaLocation="http://symfony.com/schema/dic/services
-                    http://symfony.com/schema/dic/services/services-1.0.xsd">
+                    https://symfony.com/schema/dic/services/services-1.0.xsd">
 
                 <mongodb:config>
                     <mongodb:client name="default" connectTimeoutMS="%env(int:key:timeout:query_string:MONGODB_URL)%"/>
diff --git a/routing.rst b/routing.rst
index 696d2a4e5cf..b46ac124b93 100644
--- a/routing.rst
+++ b/routing.rst
@@ -805,7 +805,7 @@ You can also use special attributes to configure them (except ``_fragment``):
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/routing
-                http://symfony.com/schema/routing/routing-1.0.xsd">
+                https://symfony.com/schema/routing/routing-1.0.xsd">
 
             <route id="article_search"
                 path="/articles/{_locale}/search.{_format}"
diff --git a/service_container/configurators.rst b/service_container/configurators.rst
index fcde444f8d6..def35e3fef9 100644
--- a/service_container/configurators.rst
+++ b/service_container/configurators.rst
@@ -205,66 +205,68 @@ Services can be configured via invokable configurators (replacing the
 ``configure()`` method with ``__invoke()``) by omitting the method name, just as
 routes can reference :ref:`invokable controllers <controller-service-invoke>`.
 
-.. code-block:: yaml
+.. configuration-block::
 
-    # config/services.yaml
-    services:
-        # ...
+    .. code-block:: yaml
 
-        # registers all classes as services, including App\Mail\EmailConfigurator
-        App\:
-            resource: '../src/*'
+        # config/services.yaml
+        services:
             # ...
 
-        # override the services to set the configurator
-        App\Mail\NewsletterManager:
-            configurator: '@App\Mail\EmailConfigurator'
+            # registers all classes as services, including App\Mail\EmailConfigurator
+            App\:
+                resource: '../src/*'
+                # ...
 
-        App\Mail\GreetingCardManager:
-            configurator: '@App\Mail\EmailConfigurator'
+            # override the services to set the configurator
+            App\Mail\NewsletterManager:
+                configurator: '@App\Mail\EmailConfigurator'
 
-.. code-block:: xml
+            App\Mail\GreetingCardManager:
+                configurator: '@App\Mail\EmailConfigurator'
 
-    <!-- config/services.xml -->
-    <?xml version="1.0" encoding="UTF-8" ?>
-    <container xmlns="http://symfony.com/schema/dic/services"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://symfony.com/schema/dic/services
-            http://symfony.com/schema/dic/services/services-1.0.xsd">
+    .. code-block:: xml
 
-        <services>
-            <prototype namespace="App\" resource="../src/*" />
+        <!-- config/services.xml -->
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                https://symfony.com/schema/dic/services/services-1.0.xsd">
 
-            <service id="App\Mail\NewsletterManager">
-                <configurator service="App\Mail\EmailConfigurator" />
-            </service>
+            <services>
+                <prototype namespace="App\" resource="../src/*"/>
 
-            <service id="App\Mail\GreetingCardManager">
-                <configurator service="App\Mail\EmailConfigurator" />
-            </service>
-        </services>
-    </container>
+                <service id="App\Mail\NewsletterManager">
+                    <configurator service="App\Mail\EmailConfigurator"/>
+                </service>
 
-.. code-block:: php
+                <service id="App\Mail\GreetingCardManager">
+                    <configurator service="App\Mail\EmailConfigurator"/>
+                </service>
+            </services>
+        </container>
 
-    // config/services.php
-    use App\Mail\GreetingCardManager;
-    use App\Mail\NewsletterManager;
-    use Symfony\Component\DependencyInjection\Definition;
-    use Symfony\Component\DependencyInjection\Reference;
+    .. code-block:: php
 
-    // Same as before
-    $definition = new Definition();
+        // config/services.php
+        use App\Mail\GreetingCardManager;
+        use App\Mail\NewsletterManager;
+        use Symfony\Component\DependencyInjection\Definition;
+        use Symfony\Component\DependencyInjection\Reference;
 
-    $definition->setAutowired(true);
+        // Same as before
+        $definition = new Definition();
 
-    $this->registerClasses($definition, 'App\\', '../src/*');
+        $definition->setAutowired(true);
 
-    $container->getDefinition(NewsletterManager::class)
-        ->setConfigurator(new Reference(EmailConfigurator::class));
+        $this->registerClasses($definition, 'App\\', '../src/*');
+
+        $container->getDefinition(NewsletterManager::class)
+            ->setConfigurator(new Reference(EmailConfigurator::class));
 
-    $container->getDefinition(GreetingCardManager::class)
-        ->setConfigurator(new Reference(EmailConfigurator::class));
+        $container->getDefinition(GreetingCardManager::class)
+            ->setConfigurator(new Reference(EmailConfigurator::class));
 
 That's it! When requesting the ``App\Mail\NewsletterManager`` or
 ``App\Mail\GreetingCardManager`` service, the created instance will first be
diff --git a/service_container/factories.rst b/service_container/factories.rst
index e121f43aea9..3fc4a979336 100644
--- a/service_container/factories.rst
+++ b/service_container/factories.rst
@@ -202,14 +202,14 @@ method name, just as routes can reference
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/dic/services
-                http://symfony.com/schema/dic/services/services-1.0.xsd">
+                https://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
                 <!-- ... -->
 
                 <service id="App\Email\NewsletterManager"
                          class="App\Email\NewsletterManager">
-                    <factory service="App\Email\NewsletterManagerFactory" />
+                    <factory service="App\Email\NewsletterManagerFactory"/>
                 </service>
             </services>
         </container>