Skip to content

Commit 2a569fe

Browse files
committed
Merge branch '6.2' into 6.3
* 6.2: Fix typos in Symfony Attributes Overview [Session] Fix an RST syntax issue fix rst syntax for ci
2 parents 33c9159 + e4b2ae6 commit 2a569fe

File tree

5 files changed

+4
-8
lines changed

5 files changed

+4
-8
lines changed

bundles/best_practices.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,4 +560,3 @@ Learn more
560560
.. _`valid license identifier`: https://spdx.org/licenses/
561561
.. _`GitHub Actions`: https://docs.github.com/en/free-pro-team@latest/actions
562562
.. _`Travis CI`: https://docs.travis-ci.com/
563-
.. _`Symfony 4.4 bundle documentation`: https://symfony.com/doc/4.4/bundles.html#bundle-directory-structure

html_sanitizer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -828,7 +828,7 @@ URLs of ``<a>`` elements:
828828
);
829829
830830
Force/Allow Media URLs
831-
~~~~~~~~~~~~~~~~~~~~~
831+
~~~~~~~~~~~~~~~~~~~~~~
832832

833833
Like :ref:`link URLs <html-sanitizer-link-url>`, you can also control the
834834
URLs of other media in the HTML. The following attributes are checked by

reference/attributes.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
Symfony Attributes Overview
55
===========================
66

7-
Attributes are the successor of annotation since PHP 8. Attributes are native
7+
Attributes are the successor of annotations since PHP 8. Attributes are native
88
to the language and Symfony takes full advantage of them across the framework
9-
ans its different components.
9+
and its different components.
1010

1111
Doctrine Bridge
1212
~~~~~~~~~~~~~~~

reference/constraints/Expression.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ Parameter Description
263263
=============== ==============================================================
264264

265265
``negate``
266-
~~~~~~~~~~~
266+
~~~~~~~~~~
267267

268268
**type**: ``boolean`` **default**: ``true``
269269

session.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1124,9 +1124,6 @@ These are parameters that you can configure:
11241124
``expiry_field`` (default ``expires_at``):
11251125
The name of the field where to store the session lifetime.
11261126

1127-
.. index::
1128-
single: Sessions, saving locale
1129-
11301127
Migrating Between Session Handlers
11311128
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
11321129

0 commit comments

Comments
 (0)