Commit640b29e

committed

Merge branch '2.5' into 2.6

* 2.5: Fixing build error Fixing build error

2 parents2560851 +5deb315 commit640b29eCopy full SHA for 640b29e

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -924,8 +924,6 @@ special attributes like this:`
`924`	`924`	`this - this is useful when whitelisting URLs to guarantee access - some`
`925`	`925`	details are in:doc:`/cookbook/security/access_control`.
`926`	`926`
`927`		`-.. _security-secure-objects:`
`928`		`-`
`929`	`927`	`.. _book-security-template-expression:`
`930`	`928`
`931`	`929`	`..versionadded::2.4`
`@@ -953,6 +951,8 @@ You can also use expressions inside your templates:`
`953`	`951`
`954`	`952`	For more details on expressions and security, see:ref:`book-security-expressions`.
`955`	`953`
	`954`	`+.. _security-secure-objects:`
	`955`	`+`
`956`	`956`	`Access Control Lists (ACLs): Securing individual Database Objects`
`957`	`957`	`~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`
`958`	`958`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ Inside the expression, you have access to a number of variables:`
`64`	`64`	The user object (or the string ``anon`` if you're not authenticated).
`65`	`65`	``roles``
`66`	`66`	`The array of roles the user has, including from the`
`67`		-:ref:`role hierarchy<book-security-role-hierarchy>` but not including the
	`67`	+:ref:`role hierarchy<security-role-hierarchy>` but not including the
`68`	`68`	``IS_AUTHENTICATED_*`` attributes (see the functions below).
`69`	`69`	``object``
`70`	`70`	The object (if any) that's passed as the second argument to ``isGranted``.

Comments

(0)