Merge branch '7.0' into 7.1

* 7.0:
  [Routing] Improving language, shortening twig code

Author: javiereguiluz

routing.rst

@@ -1581,15 +1581,11 @@ information in a controller via the ``Request`` object::
         }
     }
 
-You can get this information in services too injecting the ``request_stack``
-service to :doc:`get the Request object in a service </service_container/request>`.
-In templates, use the :ref:`Twig global app variable <twig-app-variable>` to get
-the current route and its attributes:
-
-.. code-block:: twig
-
-    {% set route_name = app.current_route %}
-    {% set route_parameters = app.current_route_parameters %}
+In services, you can get this information by
+:doc:`injecting the RequestStack service </service_container/request>`.
+In templates, use the :ref:`Twig global app variable <twig-app-variable>`
+to get the current route name (``app.current_route``) and its parameters
+(``app.current_route_parameters``).
 
 Special Routes
 --------------