Commitf8645c8

committed

Merge branch '2.3' into 2.4

2 parents78425c6 +abca098 commitf8645c8Copy full SHA for f8645c8

File tree

+10

-9

lines changed

+10

-9

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ perform a certain action.`
`20`	`20`	`..image::/images/book/security_authentication_authorization.png`
`21`	`21`	`:align:center`
`22`	`22`
`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 yourapplication with HTTP Basic authentication.`
`25`	`25`
`26`	`26`	`..note::`
`27`	`27`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -183,9 +183,9 @@ instance, if you want to match both ``m.example.com`` and
`183`	`183`
`184`	`184`	`..tip::`
`185`	`185`
`186`		- Make sure you also include a default option for the ``subdomain``
`187`		`-placeholder,otherwise you need to includethe subdomains value each time`
`188`		`-you generate the route.`
	`186`	+ Make sure you also include a default option for the ``domain`` placeholder,
	`187`	`+ otherwise you need to includea domain value each time you generate`
	`188`	`+a URL using the route.`
`189`	`189`
`190`	`190`	`..configuration-block::`
`191`	`191`

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ with a development period, followed by a maintenance period.`
`25`	`25`	`Development`
`26`	`26`	`-----------`
`27`	`27`
`28`		`-Thefirst six-month period is divided into two phases:`
	`28`	`+Thefull development period lasts six months and is divided into two phases:`
`29`	`29`
`30`	`30`	`* Development: Four months to add new features and to enhance existing`
`31`	`31`	`ones;`
`@@ -126,11 +126,12 @@ This results in very predictable dates and maintenance periods:`
`126`	`126`	`Backward Compatibility`
`127`	`127`	`----------------------`
`128`	`128`
`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.`
`131`	`132`
`132`	`133`	`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.`
`134`	`135`
`135`	`136`	`..note::`
`136`	`137`

Comments

(0)