Merge branch '3.4' into 4.1

javiereguiluz · javiereguiluz · commit 44aa31e36a2e · 2018-11-05T17:14:28.000+01:00
* 3.4:
  Fixed a formatting issue in WebLink article
  RM: Sentence about extending the Request class
  Update percent.rst
diff --git a/components/http_kernel.rst b/components/http_kernel.rst
@@ -342,8 +342,7 @@ of arguments that should be passed when executing that callable.
 
     b) If the argument in the controller is type-hinted with Symfony's
        :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``.
+       ``Request`` is passed in as the value.
 
     c) If the function or method argument is `variadic`_ and the ``Request``
        ``attributes`` bag contains an array for that argument, they will all be
diff --git a/reference/forms/types/percent.rst b/reference/forms/types/percent.rst
@@ -5,7 +5,7 @@ PercentType Field
 =================
 
 The ``PercentType`` renders an input text field and specializes in handling
-percentage data. If your percentage data is stored as a decimal (e.g. ``.95``),
+percentage data. If your percentage data is stored as a decimal (e.g. ``0.95``),
 you can use this field out-of-the-box. If you store your data as a number
 (e.g. ``95``), you should set the ``type`` option to ``integer``.
 
@@ -56,14 +56,14 @@ type
 **type**: ``string`` **default**: ``fractional``
 
 This controls how your data is stored on your object. For example, a percentage
-corresponding to "55%", might be stored as ``.55`` or ``55`` on your
+corresponding to "55%", might be stored as ``0.55`` or ``55`` on your
 object. The two "types" handle these two cases:
 
 *   ``fractional``
-    If your data is stored as a decimal (e.g. ``.55``), use this type.
+    If your data is stored as a decimal (e.g. ``0.55``), use this type.
     The data will be multiplied by ``100`` before being shown to the
     user (e.g. ``55``). The submitted data will be divided by ``100``
-    on form submit so that the decimal value is stored (``.55``);
+    on form submit so that the decimal value is stored (``0.55``);
 
 *   ``integer``
     If your data is stored as an integer (e.g. 55), then use this option.
diff --git a/weblink.rst b/weblink.rst
@@ -112,8 +112,8 @@ The WebLink component provides the following Twig functions to send those hints:
   which includes the DNS lookup, TCP handshake, and optional TLS negotiation, allows
   the user agent to mask the high latency costs of establishing a connection".
 * ``prefetch()``: "identifies a resource that might be required by the next
-   navigation, and that the user agent *should* fetch, such that the user agent
-   can deliver a faster response once the resource is requested in the future".
+  navigation, and that the user agent *should* fetch, such that the user agent
+  can deliver a faster response once the resource is requested in the future".
 * ``prerender()``: "identifies a resource that might be required by the next
   navigation, and that the user agent *should* fetch and execute, such that the
   user agent can deliver a faster response once the resource is requested later".
