Merge branch '5.4' into 6.2

* 5.4:
  Consolidate templating docs

Author: javiereguiluz

_build/redirection_map

@@ -256,7 +256,8 @@
 /cookbook/session/proxy_examples /session/proxy_examples
 /cookbook/session/sessions_directory /session/sessions_directory
 /cookbook/symfony1 /introduction/symfony1
-/cookbook/templating/global_variables /templating/global_variables
+/cookbook/templating/global_variables /templating#templating-global-variables
+/templating/global_variables /templating#templating-global-variables
 /cookbook/templating/index /templating
 /cookbook/templating/namespaced_paths /templating/namespaced_paths
 /cookbook/templating/PHP /templating/PHP
@@ -388,6 +389,9 @@
 /quick_tour/the_view /quick_tour/flex_recipes
 /service_container/service_locators /service_container/service_subscribers_locators
 /templating/overriding /bundles/override
+/templating/twig_extension /templates#templates-twig-extension
+/templating/hinclude /templates#templates-hinclude
+/templating/PHP /templates
 /security/custom_provider /security/user_provider
 /security/multiple_user_providers /security/user_provider
 /security/custom_password_authenticator /security/guard_authentication

reference/configuration/framework.rst

@@ -730,7 +730,7 @@ is disabled. This can be either a template name or the content itself.
 
 .. seealso::
 
-    See :doc:`/templating/hinclude` for more information about hinclude.
+    See :ref:`templates-hinclude` for more information about hinclude.
 
 .. _reference-fragments-path:
 

reference/configuration/twig.rst

@@ -300,7 +300,7 @@ globals
 **type**: ``array`` **default**: ``[]``
 
 It defines the global variables injected automatically into all Twig templates.
-Learn more about :doc:`Twig global variables </templating/global_variables>`.
+Learn more about :ref:`Twig global variables <templating-global-variables>`.
 
 mailer
 ~~~~~~

reference/dic_tags.rst

@@ -1263,7 +1263,7 @@ the service is auto-registered and auto-tagged. But, you can also register it ma
 
 For information on how to create the actual Twig Extension class, see
 `Twig's documentation`_ on the topic or read the
-:doc:`/templating/twig_extension` article.
+:ref:`templates-twig-extension` article.
 
 twig.loader
 -----------

reference/twig_reference.rst

@@ -12,7 +12,7 @@ components with Twig templates. This article explains them all.
 .. tip::
 
     If these extensions provided by Symfony are not enough, you can
-    :doc:`create a custom Twig extension </templating/twig_extension>` to define
+    :ref:`create a custom Twig extension <templates-twig-extension>` to define
     even more filters and functions.
 
 .. _reference-twig-functions:

security/csrf.rst

@@ -71,7 +71,7 @@ protected forms. As an alternative, you can:
 * Embed the form inside an uncached :doc:`ESI fragment </http_cache/esi>` and
   cache the rest of the page contents;
 * Cache the entire page and load the form via an uncached AJAX request;
-* Cache the entire page and use :doc:`hinclude.js </templating/hinclude>` to
+* Cache the entire page and use :ref:`hinclude.js <templates-hinclude>` to
   load the CSRF token with an uncached AJAX request and replace the form
   field value with it.