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

Author: weaverryan

email/dev_environment.rst

@@ -191,6 +191,10 @@ In the above example all email messages will be redirected to ``[email protected]`
 and messages sent to the ``[email protected]`` address or to any email address
 belonging to the domain ``specialdomain.com`` will also be delivered as normal.
 
+.. caution::
+
+    The ``delivery_whitelist`` option is ignored unless the ``delivery_addresses`` option is defined.
+
 Viewing from the Web Debug Toolbar
 ----------------------------------
 

reference/constraints/Collection.rst

@@ -95,7 +95,7 @@ following:
                         fields:
                             personal_email: Email
                             short_bio:
-                                - NotBlank
+                                - NotBlank: ~
                                 - Length:
                                     max:   100
                                     maxMessage: Your short bio is too long!
@@ -223,7 +223,7 @@ you can do the following:
                     - Collection:
                         fields:
                             personal_email:
-                                - Required
+                                - Required:
                                     - NotBlank: ~
                                     - Email: ~
                             alternate_email:

security.rst

@@ -1004,8 +1004,8 @@ To accomplish this you have 2 options:
 In both cases, you'll still deny access using methods similar to what was
 shown above.
 
-Retrieving the User Object
---------------------------
+3) Retrieving the User Object
+-----------------------------
 
 After authentication, the ``User`` object of the current user can be accessed
 via the ``security.token_storage`` service. From inside a controller, this will