Merge branch '5.4' into 6.0

javiereguiluz · javiereguiluz · commit 9c55d5bb01a0 · 2021-11-12T15:48:44.000+01:00
* 5.4:
  [Security] Minor fix
diff --git a/security/access_control.rst b/security/access_control.rst
@@ -326,7 +326,7 @@ key:
             access_control:
                 -
                     path: ^/_internal/secure
-                    # the 'roles' and 'allow-if' options work like an OR expression, so
+                    # the 'roles' and 'allow_if' options work like an OR expression, so
                     # access is granted if the expression is TRUE or the user has ROLE_ADMIN
                     roles: 'ROLE_ADMIN'
                     allow_if: "'127.0.0.1' == request.getClientIp() or request.headers.has('X-Secure-Access')"

Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,7 @@ key:`
`326`	`326`	`access_control:`
`327`	`327`	`-`
`328`	`328`	`path: ^/_internal/secure`
`329`		`- # the 'roles' and 'allow-if' options work like an OR expression, so`
	`329`	`+ # the 'roles' and 'allow_if' options work like an OR expression, so`
`330`	`330`	`# access is granted if the expression is TRUE or the user has ROLE_ADMIN`
`331`	`331`	`roles: 'ROLE_ADMIN'`
`332`	`332`	`allow_if: "'127.0.0.1' == request.getClientIp() or request.headers.has('X-Secure-Access')"`