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 a4ef0e1

Browse filesBrowse files
committed
Merge branch '2.4'
2 parents 80045df + f8645c8 commit a4ef0e1
Copy full SHA for a4ef0e1

File tree

Expand file treeCollapse file tree

3 files changed

+10
-9
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+10
-9
lines changed

‎book/security.rst

Copy file name to clipboardExpand all lines: book/security.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ perform a certain action.
2020
.. image:: /images/book/security_authentication_authorization.png
2121
:align: center
2222

23-
Since the best way to learn is to see an example, start by securing your
24-
application with HTTP Basic authentication.
23+
Since the best way to learn is to see an example, just imagine that you want
24+
to secure your application with HTTP Basic authentication.
2525

2626
.. note::
2727

‎components/routing/hostname_pattern.rst

Copy file name to clipboardExpand all lines: components/routing/hostname_pattern.rst
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ instance, if you want to match both ``m.example.com`` and
180180

181181
.. tip::
182182

183-
Make sure you also include a default option for the ``subdomain``
184-
placeholder, otherwise you need to include the subdomains value each time
185-
you generate the route.
183+
Make sure you also include a default option for the ``domain`` placeholder,
184+
otherwise you need to include a domain value each time you generate
185+
a URL using the route.
186186

187187
.. configuration-block::
188188

‎contributing/community/releases.rst

Copy file name to clipboardExpand all lines: contributing/community/releases.rst
+5-4Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ with a development period, followed by a maintenance period.
2525
Development
2626
-----------
2727

28-
The first six-month period is divided into two phases:
28+
The full development period lasts six months and is divided into two phases:
2929

3030
* *Development*: *Four months* to add new features and to enhance existing
3131
ones;
@@ -126,11 +126,12 @@ This results in very predictable dates and maintenance periods:
126126
Backward Compatibility
127127
----------------------
128128

129-
Our `Backwards Compatibility Promise`_ is very strict and allows developers to
130-
upgrade with confidence from one minor version of Symfony to the next one.
129+
Our :doc:`Backwards Compatibility Promise </contributing/code/bc>` is very
130+
strict and allows developers to upgrade with confidence from one minor version
131+
of Symfony to the next one.
131132

132133
Whenever keeping backward compatibility is not possible, the feature, the
133-
enhancement, or the bug fix will be scheduled for the next major version.
134+
enhancement or the bug fix will be scheduled for the next major version.
134135

135136
.. note::
136137

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.