Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 0f92bc4

Browse filesBrowse files
committed
Merge branch '6.2' into 6.3
* 6.2: Consolidate templating docs
2 parents c409d8c + cbce155 commit 0f92bc4
Copy full SHA for 0f92bc4

File tree

Expand file treeCollapse file tree

11 files changed

+399
-415
lines changed
Filter options
Expand file treeCollapse file tree

11 files changed

+399
-415
lines changed

‎_build/redirection_map

Copy file name to clipboardExpand all lines: _build/redirection_map
+5-1Lines changed: 5 additions & 1 deletion
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

Copy file name to clipboardExpand all lines: reference/configuration/framework.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ is disabled. This can be either a template name or the content itself.
730730

731731
.. seealso::
732732

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

735735
.. _reference-fragments-path:
736736

‎reference/configuration/twig.rst

Copy file name to clipboardExpand all lines: reference/configuration/twig.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ globals
300300
**type**: ``array`` **default**: ``[]``
301301

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

305305
mailer
306306
~~~~~~

‎reference/dic_tags.rst

Copy file name to clipboardExpand all lines: reference/dic_tags.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1263,7 +1263,7 @@ the service is auto-registered and auto-tagged. But, you can also register it ma
12631263
12641264
For information on how to create the actual Twig Extension class, see
12651265
`Twig's documentation`_ on the topic or read the
1266-
:doc:`/templating/twig_extension` article.
1266+
:ref:`templates-twig-extension` article.
12671267

12681268
twig.loader
12691269
-----------

‎reference/twig_reference.rst

Copy file name to clipboardExpand all lines: reference/twig_reference.rst
+1-1Lines changed: 1 addition & 1 deletion
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

Copy file name to clipboardExpand all lines: security/csrf.rst
+1-1Lines changed: 1 addition & 1 deletion
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 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.