From ff923859529ce63a201fbc6e4e26aa2559c6f677 Mon Sep 17 00:00:00 2001 From: Tom Haskins-Vaughan Date: Wed, 1 Nov 2017 15:07:46 -0400 Subject: [PATCH 1/3] Clarifying usage of delivery_whitelist There was nothing to suggest that `delivery_whitelist` could not be used on its own. We had to find this out by trial an error. Hopefully, this change (or better equivalent) will help other people. Cheers. --- email/dev_environment.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/email/dev_environment.rst b/email/dev_environment.rst index dcb19516e47..fa2b733fb64 100644 --- 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 can only be used in conjuction with the ``delivery_addresses`` option. + Viewing from the Web Debug Toolbar ---------------------------------- From c572e883b512452cd0b4adcf76b629022b6cbc40 Mon Sep 17 00:00:00 2001 From: Tom Haskins-Vaughan Date: Fri, 3 Nov 2017 16:29:28 -0400 Subject: [PATCH 2/3] Making message simpler and more concise --- email/dev_environment.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/email/dev_environment.rst b/email/dev_environment.rst index fa2b733fb64..708de198d71 100644 --- a/email/dev_environment.rst +++ b/email/dev_environment.rst @@ -192,7 +192,7 @@ belonging to the domain ``specialdomain.com`` will also be delivered as normal. .. caution:: - The ``delivery_whitelist`` option can only be used in conjuction with the ``delivery_addresses`` option. + The delivery_whitelist option is ignored unless the delivery_addresses option is defined. Viewing from the Web Debug Toolbar ---------------------------------- From 55aec206dedbd84b1688171f587bfc61aedc36f4 Mon Sep 17 00:00:00 2001 From: Tom Haskins-Vaughan Date: Fri, 3 Nov 2017 16:30:33 -0400 Subject: [PATCH 3/3] Adding missing backticks --- email/dev_environment.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/email/dev_environment.rst b/email/dev_environment.rst index 708de198d71..ebb0a46024f 100644 --- a/email/dev_environment.rst +++ b/email/dev_environment.rst @@ -192,7 +192,7 @@ 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. + The ``delivery_whitelist`` option is ignored unless the ``delivery_addresses`` option is defined. Viewing from the Web Debug Toolbar ----------------------------------