Merge branch '2.8' into 3.3

weaverryan · weaverryan · commit ce4881ce8152 · 2017-11-05T15:33:13.000-05:00
* 2.8:
  Clarifying usage of delivery_whitelist
  Add missing : and ~ in the yaml code block
  more underlining!
  Update security.rst
diff --git a/email/dev_environment.rst b/email/dev_environment.rst
@@ -190,6 +190,10 @@ In the above example all email messages will be redirected to ``dev@example.com`
 and messages sent to the ``admin@mydomain.com`` 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
 ----------------------------------
 
diff --git a/reference/constraints/Collection.rst b/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!
@@ -219,7 +219,7 @@ you can do the following:
                     - Collection:
                         fields:
                             personal_email:
-                                - Required
+                                - Required:
                                     - NotBlank: ~
                                     - Email: ~
                             alternate_email:
