Merge branch '4.2' into 4.3

* 4.2:
  Use correct filepaths for 4.2
  Ordered use statements

Author: javiereguiluz

controller/service.rst

@@ -103,14 +103,14 @@ which is a common practice when following the `ADR pattern`_
 
     .. code-block:: yaml
 
-        # app/config/routing.yml
+        # config/routes.yaml
         hello:
             path:     /hello/{name}
             defaults: { _controller: app.hello_controller }
 
     .. code-block:: xml
 
-        <!-- app/config/routing.xml -->
+        <!-- config/routes.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <routes xmlns="http://symfony.com/schema/routing"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

security/form_login_setup.rst

@@ -74,7 +74,7 @@ class that processes the login submit and 4) updates the main security config fi
         }
     }
 
-Edit the ``security.yml`` file in order to allow access for anyone to the
+Edit the ``security.yaml`` file in order to allow access for anyone to the
 ``/login`` route:
 
 .. configuration-block::

workflow.rst

@@ -46,7 +46,7 @@ like this:
 
     .. code-block:: yaml
 
-        # app/config/config.yml
+        # config/framework.yaml
         framework:
             workflows:
                 blog_publishing:
@@ -197,8 +197,8 @@ As configured, the following property is used by the marking store::
 With this workflow named ``blog_publishing``, you can get help to decide
 what actions are allowed on a blog post::
 
-    use Symfony\Component\Workflow\Exception\LogicException;
     use App\Entity\BlogPost;
+    use Symfony\Component\Workflow\Exception\LogicException;
 
     $post = BlogPost();
 
@@ -680,8 +680,8 @@ requires:
 
 Then you can access this metadata in your controller as follows::
 
-    use Symfony\Component\Workflow\Registry;
     use App\Entity\BlogPost;
+    use Symfony\Component\Workflow\Registry;
 
     public function myController(Registry $registry, BlogPost $post)
     {