Merge branch '3.4' into 4.2

OskarStark · OskarStark · commit a1427e507efc · 2019-04-12T13:00:09.000+02:00
* 3.4:
  reword versionadded sentences a bit
diff --git a/contributing/documentation/format.rst b/contributing/documentation/format.rst
@@ -191,8 +191,8 @@ describe how the behavior has changed:
 
     .. versionadded:: 3.4
 
-        Support for annotation routing without an external bundle was added in
-        Symfony 3.4. Prior, you needed to install the SensioFrameworkExtraBundle.
+        Support for annotation routing without an external bundle was introduced
+        in Symfony 3.4. Prior, you needed to install the SensioFrameworkExtraBundle.
 
 For a deprecation use the ``.. deprecated:: 3.X`` directive:
 
diff --git a/controller.rst b/controller.rst
@@ -185,8 +185,18 @@ Templating and Twig are explained more in the
 .. _controller-accessing-services:
 .. _accessing-other-services:
 
+<<<<<<< HEAD
 Fetching Services
 ~~~~~~~~~~~~~~~~~
+=======
+Fetching Services as Controller Arguments
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. versionadded:: 3.3
+
+    The ability to type-hint a controller argument in order to receive a service
+    was introduced in Symfony 3.3.
+>>>>>>> 3.4
 
 Symfony comes *packed* with a lot of useful objects, called :doc:`services </service_container>`.
 These are used for rendering templates, sending emails, querying the database and
diff --git a/service_container.rst b/service_container.rst
@@ -775,7 +775,15 @@ For more details about autowiring, check out :doc:`/service_container/autowiring
 The autoconfigure Option
 ------------------------
 
+<<<<<<< HEAD
 Above, the ``services.yaml`` file has ``autoconfigure: true`` in the ``_defaults``
+=======
+.. versionadded:: 3.3
+
+    The ``autoconfigure`` option was introduced in Symfony 3.3.
+
+Above, the ``services.yml`` file has ``autoconfigure: true`` in the ``_defaults``
+>>>>>>> 3.4
 section so that it applies to all services defined in that file. With this setting,
 the container will automatically apply certain configuration to your services, based
 on your service's *class*. This is mostly used to *auto-tag* your services.
