Processed feedback

linaori · linaori · commit a26f62270806 · 2016-06-12T13:53:17.000+02:00
diff --git a/components/http_kernel/introduction.rst b/components/http_kernel/introduction.rst
@@ -85,14 +85,17 @@ is really simple and involves creating an
 :doc:`event dispatcher </components/event_dispatcher/introduction>` and a
 :ref:`controller resolver <component-http-kernel-resolve-controller>` (explained
 below). To complete your working kernel, you'll add more event listeners
-to the events discussed below
+to the events discussed below.
 
 .. caution::
 
-    As of 3.1 the :class:`Symfony\\Component\\Httpkernel\\HttpKernel` accepts a fourth argument, which
-    should be an instance of :class:`Symfony\\Component\\Httpkernel\\Controller\\ArgumentResolverInterface`.
-    In 4.0 this argument will become mandatory and the :class:`Symfony\\Component\\Httpkernel\\HttpKernel`
-    will no longer be able to fall back to the :class:`Symfony\\Component\\Httpkernel\\Controller\\ControllerResolver`.
+    As of 3.1 the :class:`Symfony\\Component\\Httpkernel\\HttpKernel` accepts a
+    fourth argument, which must be an instance of
+    :class:`Symfony\\Component\\Httpkernel\\Controller\\ArgumentResolverInterface`.
+    In 4.0 this argument will become mandatory and the
+    :class:`Symfony\\Component\\Httpkernel\\HttpKernel`
+    will no longer be able to fall back to the
+    :class:`Symfony\\Component\\Httpkernel\\Controller\\ControllerResolver`.
 
  .. code-block:: php
 
@@ -225,18 +228,16 @@ Your job is to create a class that implements the interface and fill in its
 two methods: ``getController`` and ``getArguments``. In fact, one default
 implementation already exists, which you can use directly or learn from:
 :class:`Symfony\\Component\\HttpKernel\\Controller\\ControllerResolver`.
-This implementation is explained more in the sidebar below
-
+This implementation is explained more in the sidebar below.
 
 .. caution::
 
-    The `getArguments()` method in the :class:`Symfony\\Component\\Httpkernel\\Controller\\ControllerResolver`
+    The ``getArguments()`` method in the :class:`Symfony\\Component\\Httpkernel\\Controller\\ControllerResolver`
     and respective interface :class:`Symfony\\Component\\Httpkernel\\Controller\\ControllerResolverInterface`
     are deprecated as of 3.1 and will be removed in 4.0. You can use the
     :class:`Symfony\\Component\\Httpkernel\\Controller\\ArgumentResolver` which uses the
     :class:`Symfony\\Component\\Httpkernel\\Controller\\ArgumentResolverInterface` instead.
 
-
 .. code-block:: php
 
     namespace Symfony\Component\HttpKernel\Controller;
@@ -363,9 +364,9 @@ of arguments that should be passed when executing that callable.
        from the ``RouterListener``).
 
     b) If the argument in the controller is type-hinted with Symfony's
-       :class:`Symfony\\Component\\HttpFoundation\\Request` object, then the
-       ``Request`` is passed in as the value. If you have a custom class extending
-       the ``Request``, this is also accepted.
+       :class:`Symfony\\Component\\HttpFoundation\\Request` object, the
+       ``Request`` is passed in as the value. If you have a custom ``Request``
+       class, it will be injected as long as you extend the Symfony ``Request``.
 
     c) If the function or method argument is `variadic`_ and the ``Request``
        ``attributes`` bag contains and array for that argument, they will all be
@@ -652,7 +653,7 @@ to the core events, use any controller resolver that implements the
 :class:`Symfony\\Component\\HttpKernel\\Controller\\ControllerResolverInterface` and
 use any argument resolver that implements the
 :class:`Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolverInterface`.
-However, the HttpKernel component comes with some built-in listeners, and everything
+However, the HttpKernel component comes with some built-in listeners and everything
 else that can be used to create a working example::
 
    use Symfony\Component\EventDispatcher\EventDispatcher;
diff --git a/create_framework/http_kernel_controller_resolver.rst b/create_framework/http_kernel_controller_resolver.rst
@@ -44,17 +44,22 @@ component:
     $ composer require symfony/http-kernel
 
 The HttpKernel component has many interesting features, but the ones we need
-right now are the *controller resolver* and *argument resolver*. A controller resolver knows how to
-determine the controller to execute and the argument resolver determines the arguments to pass to it,
-based on a Request object. All controller resolvers implement the following interface
+right now are the *controller resolver* and *argument resolver*. A controller
+resolver knows how to determine the controller to execute and the argument
+resolver determines the arguments to pass to it. All controller resolvers
+implement the following interface:
 
 .. caution::
 
-    The `getArguments()` method in the :class:`Symfony\\Component\\Httpkernel\\Controller\\ControllerResolver`
-    and respective interface :class:`Symfony\\Component\\Httpkernel\\Controller\\ControllerResolverInterface`
+    The ``getArguments()`` method in the
+    :class:`Symfony\\Component\\Httpkernel\\Controller\\ControllerResolver`
+    and respective interface
+    :class:`Symfony\\Component\\Httpkernel\\Controller\\ControllerResolverInterface`
     are deprecated as of 3.1 and will be removed in 4.0. You can use the
-    :class:`Symfony\\Component\\Httpkernel\\Controller\\ArgumentResolver` which uses the
-    :class:`Symfony\\Component\\Httpkernel\\Controller\\ArgumentResolverInterface` instead.
+    :class:`Symfony\\Component\\Httpkernel\\Controller\\ArgumentResolver`
+    which uses the
+    :class:`Symfony\\Component\\Httpkernel\\Controller\\ArgumentResolverInterface`
+    instead.
 
 .. code-block:: php
 
