Merge branch '3.4' into 4.1

javiereguiluz · javiereguiluz · commit 4e24dbc77b56 · 2018-11-28T12:30:57.000+01:00
* 3.4: Fixed the TOC of the main Forms article Framework configuration > Cache pools > Fix FQCN [#10401] fix markup Reworded the caution message
diff --git a/forms.rst b/forms.rst
@@ -711,11 +711,10 @@ Learn more
     :maxdepth: 1
     :glob:
 
-    form/*
-
-* :doc:`/controller/upload_file`
-* :doc:`/reference/forms/types`
-* :doc:`/http_cache/form_csrf_caching`
+    /form/*
+    /controller/upload_file
+    /reference/forms/types
+    /http_cache/form_csrf_caching
 
 .. _`Symfony Form component`: https://github.com/symfony/form
 .. _`DateTime`: https://php.net/manual/en/class.datetime.php
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
@@ -2026,7 +2026,7 @@ settings from the base pool as defaults.
 
 .. note::
 
-    Your service MUST implement the ``Psr\\Cache\\CacheItemPoolInterface`` interface.
+    Your service MUST implement the ``Psr\Cache\CacheItemPoolInterface`` interface.
 
 public
 """"""
