Skip to content

Commit 91e201f

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: Clarifying usage of delivery_whitelist Add missing : and ~ in the yaml code block more underlining! Update security.rst
2 parents 58fdfc3 + ebd7e6d commit 91e201f

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

email/dev_environment.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,10 @@ In the above example all email messages will be redirected to ``[email protected]`
191191
and messages sent to the ``[email protected]`` address or to any email address
192192
belonging to the domain ``specialdomain.com`` will also be delivered as normal.
193193

194+
.. caution::
195+
196+
The ``delivery_whitelist`` option is ignored unless the ``delivery_addresses`` option is defined.
197+
194198
Viewing from the Web Debug Toolbar
195199
----------------------------------
196200

reference/constraints/Collection.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ following:
9595
fields:
9696
personal_email: Email
9797
short_bio:
98-
- NotBlank
98+
- NotBlank: ~
9999
- Length:
100100
max: 100
101101
maxMessage: Your short bio is too long!
@@ -223,7 +223,7 @@ you can do the following:
223223
- Collection:
224224
fields:
225225
personal_email:
226-
- Required
226+
- Required:
227227
- NotBlank: ~
228228
- Email: ~
229229
alternate_email:

security.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,8 +1004,8 @@ To accomplish this you have 2 options:
10041004
In both cases, you'll still deny access using methods similar to what was
10051005
shown above.
10061006

1007-
Retrieving the User Object
1008-
--------------------------
1007+
3) Retrieving the User Object
1008+
-----------------------------
10091009

10101010
After authentication, the ``User`` object of the current user can be accessed
10111011
via the ``security.token_storage`` service. From inside a controller, this will

0 commit comments

Comments
 (0)