8000 Merge branch '3.4' into 4.1 · symfony/symfony-docs@4e24dbc · GitHub
[go: up one dir, main page]

Skip to content

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 4e24dbc

Browse files
committed
Merge branch '3.4' into 4.1
* 3.4: Fixed the TOC of the main Forms article Framework configuration > Cache pools > Fix FQCN [#10401] fix markup Reworded the caution message
2 parents b9295c8 + a21e573 commit 4e24dbc

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

forms.rst

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -711,11 +711,10 @@ Learn more
711711
:maxdepth: 1
712712
:glob:
713713

714-
form/*
715-
716-
* :doc:`/controller/upload_file`
717-
* :doc:`/reference/forms/types`
718-
* :doc:`/http_cache/form_csrf_caching`
714+
/form/*
715+
/controller/upload_file
716+
/reference/forms/types
717+
/http_cache/form_csrf_caching
719718

720719
.. _`Symfony Form component`: https://github.com/symfony/form
721720
.. _`DateTime`: https://php.net/manual/en/class.datetime.php

reference/configuration/framework.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2026,7 +2026,7 @@ settings from the base pool as defaults.
20262026

20272027
.. note::
20282028

2029-
Your service MUST implement the ``Psr\\Cache\\CacheItemPoolInterface`` interface.
2029+
Your service MUST implement the ``Psr\Cache\CacheItemPoolInterface`` interface.
20302030

20312031
public
20322032
""""""

0 commit comments

Comments
 (0)
0