Skip to content

Commit fa3a677

Browse files
fabpotjaviereguiluz
authored andcommitted
Consolidate templating docs
1 parent aee8f75 commit fa3a677

File tree

11 files changed

+403
-415
lines changed

11 files changed

+403
-415
lines changed

_build/redirection_map

+5-1
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,8 @@
256256
/cookbook/session/proxy_examples /session/proxy_examples
257257
/cookbook/session/sessions_directory /session/sessions_directory
258258
/cookbook/symfony1 /introduction/symfony1
259-
/cookbook/templating/global_variables /templating/global_variables
259+
/cookbook/templating/global_variables /templating#templating-global-variables
260+
/templating/global_variables /templating#templating-global-variables
260261
/cookbook/templating/index /templating
261262
/cookbook/templating/namespaced_paths /templating/namespaced_paths
262263
/cookbook/templating/PHP /templating/PHP
@@ -388,6 +389,9 @@
388389
/quick_tour/the_view /quick_tour/flex_recipes
389390
/service_container/service_locators /service_container/service_subscribers_locators
390391
/templating/overriding /bundles/override
392+
/templating/twig_extension /templates#templates-twig-extension
393+
/templating/hinclude /templates#templates-hinclude
394+
/templating/PHP /templates
391395
/security/custom_provider /security/user_provider
392396
/security/multiple_user_providers /security/user_provider
393397
/security/custom_password_authenticator /security/guard_authentication

reference/configuration/framework.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ is disabled. This can be either a template name or the content itself.
736736

737737
.. seealso::
738738

739-
See :doc:`/templating/hinclude` for more information about hinclude.
739+
See :ref:`templates-hinclude` for more information about hinclude.
740740

741741
.. _reference-fragments-path:
742742

reference/configuration/twig.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ globals
231231
**type**: ``array`` **default**: ``[]``
232232

233233
It defines the global variables injected automatically into all Twig templates.
234-
Learn more about :doc:`Twig global variables </templating/global_variables>`.
234+
Learn more about :ref:`Twig global variables <templating-global-variables>`.
235235

236236
number_format
237237
~~~~~~~~~~~~~

reference/dic_tags.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1287,7 +1287,7 @@ the service is auto-registered and auto-tagged. But, you can also register it ma
12871287
12881288
For information on how to create the actual Twig Extension class, see
12891289
`Twig's documentation`_ on the topic or read the
1290-
:doc:`/templating/twig_extension` article.
1290+
:ref:`templates-twig-extension` article.
12911291

12921292
twig.loader
12931293
-----------

reference/twig_reference.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ components with Twig templates. This article explains them all.
1212
.. tip::
1313

1414
If these extensions provided by Symfony are not enough, you can
15-
:doc:`create a custom Twig extension </templating/twig_extension>` to define
15+
:ref:`create a custom Twig extension <templates-twig-extension>` to define
1616
even more filters and functions.
1717

1818
.. _reference-twig-functions:

security/csrf.rst

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

0 commit comments

Comments
 (0)