Commit14b0c47

committed

Merge branch '2.3' into 2.4

2 parents2cbca5f +34eceb1 commit14b0c47Copy full SHA for 14b0c47

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1258,7 +1258,7 @@ route. With this information, any URL can easily be generated::`
`1258`	`1258`	:class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller`,
`1259`	`1259`	`you can use the`
`1260`	`1260`	:method:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller::generateUrl`
`1261`		`- method, whichcall's the router service's`
	`1261`	`+ method, whichcalls the router service's`
`1262`	`1262`	:method:`Symfony\\Component\\Routing\\Router::generate` method.
`1263`	`1263`
`1264`	`1264`	`In an upcoming section, you'll learn how to generate URLs from inside templates.`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -902,7 +902,7 @@ the trusted reverse proxy cache.`
`902`	`902`	does not restrict to a specific IP address. Instead, using the ``ip``
`903`	`903`	key means that the ``access_control`` entry will only match this IP address,
`904`	`904`	`and users accessing it from a different IP address will continue down`
`905`		- the ``acces_control`` list.
	`905`	+ the ``access_control`` list.
`906`	`906`
`907`	`907`	`Here is an example of how you might secure all ESI routes that start with a`
`908`	`908`	given prefix, ``/esi``, from outside access:
`@@ -1653,7 +1653,7 @@ Roles`
`1653`	`1653`
`1654`	`1654`	`The idea of a "role" is key to the authorization process. Each user is assigned`
`1655`	`1655`	`a set of roles and then each resource requires one or more roles. If the user`
`1656`		`-has the required roles, access is granted. Otherwise access is denied.`
	`1656`	`+hasany one ofthe required roles, access is granted. Otherwise access is denied.`
`1657`	`1657`
`1658`	`1658`	`Roles are pretty simple, and are basically strings that you can invent and`
`1659`	`1659`	`use as needed (though roles are objects internally). For example, if you`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -34,7 +34,7 @@ an ``Address`` instance in the ``$address`` property.
`34`	`34`	`..code-block::php`
`35`	`35`
`36`	`36`	`// src/Acme/HelloBundle/Entity/Author.php`
`37`		`- namespaceAmce\HelloBundle\Entity;`
	`37`	`+ namespaceAcme\HelloBundle\Entity;`
`38`	`38`
`39`	`39`	`class Author`
`40`	`40`	`{`

Comments

(0)