Skip to content

Commit 21b8998

Browse files
committed
Merge branch '4.4' into 5.2
* 4.4: Some minor rewords
2 parents bb73787 + 454c5fe commit 21b8998

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

frontend/encore/babel.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Need to extend the Babel configuration further? The easiest way is via
2424
babelConfig.plugins.push('styled-jsx/babel');
2525
}, {
2626
// node_modules is not processed through Babel by default
27-
// but you can whitelist specific modules to process
27+
// but you can allow some specific modules to be processed
2828
includeNodeModules: ['foundation-sites'],
2929
3030
// or completely control the exclude rule (note that you

reference/configuration/framework.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ instance), the host might have been manipulated by an attacker.
562562
The Symfony :method:`Request::getHost() <Symfony\\Component\\HttpFoundation\\Request::getHost>`
563563
method might be vulnerable to some of these attacks because it depends on
564564
the configuration of your web server. One simple solution to avoid these
565-
attacks is to whitelist the hosts that your Symfony application can respond
565+
attacks is to configure a list of hosts that your Symfony application can respond
566566
to. That's the purpose of this ``trusted_hosts`` option. If the incoming
567567
request's hostname doesn't match one of the regular expressions in this list,
568568
the application won't respond and the user will receive a 400 response.

reference/constraints/Uuid.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ UUID
44
Validates that a value is a valid `Universally unique identifier (UUID)`_ per `RFC 4122`_.
55
By default, this will validate the format according to the RFC's guidelines, but this can
66
be relaxed to accept non-standard UUIDs that other systems (like PostgreSQL) accept.
7-
UUID versions can also be restricted using a whitelist.
7+
UUID versions can also be restricted using a list of allowed versions.
88

99
========== ===================================================================
1010
Applies to :ref:`property or method <validation-property-target>`

security.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,8 +1048,8 @@ like this:
10481048
will have ``IS_AUTHENTICATED_REMEMBERED`` but will not have ``IS_AUTHENTICATED_FULLY``.
10491049

10501050
* ``IS_AUTHENTICATED_ANONYMOUSLY``: *All* users (even anonymous ones) have
1051-
this - this is useful when *whitelisting* URLs to guarantee access - some
1052-
details are in :doc:`/security/access_control`.
1051+
this - this is useful when defining a list of URLs with no access restriction
1052+
- some details are in :doc:`/security/access_control`.
10531053

10541054
* ``IS_ANONYMOUS``: *Only* anonymous users are matched by this attribute.
10551055

0 commit comments

Comments
 (0)