Merge branch '4.4' into 5.0

wouterj · wouterj · commit 0a9f9ac0771e · 2020-02-24T19:45:03.000+01:00
* 4.4:
  Fixed wrongly resolved merge conflict
diff --git a/service_container.rst b/service_container.rst
@@ -1033,7 +1033,7 @@ for classes under the same namespace:
 In order to have multiple definitions, add the ``namespace`` option and use any
 unique string as the key of each service config:
 
-.. configuration-block::
+.. code-block:: yaml
 
     # config/services.yaml
     services:
