Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Reference] Add missing option delivery_whitelist #5056

Merged
merged 5 commits into from
Mar 14, 2015
Merged

[Reference] Add missing option delivery_whitelist #5056

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0195619
[Reference] Add missing option delivery_whitelist
TerjeBr Mar 2, 2015
07855f6
Removed + from copied diff
TerjeBr Mar 2, 2015
ce8719d
Changed link into ref
TerjeBr Mar 2, 2015
2aab241
added link target/label in the cookbook
TerjeBr Mar 2, 2015
03279dc
Added double backticks. And also a full stop.
TerjeBr Mar 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cookbook/email/dev_environment.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ the replaced address, so you can still see who it would have been sent to.
These are ``X-Swift-Cc`` and ``X-Swift-Bcc`` for the ``CC`` and ``BCC``
addresses respectively.

.. _sending-to-a-specified-address-but-with-exceptions:

Sending to a Specified Address but with Exceptions
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Expand Down
10 changes: 10 additions & 0 deletions reference/configuration/swiftmailer.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ Configuration
* `threshold`_
* `sleep`_
* `delivery_address`_
* `delivery_whitelist`_
* `disable_delivery`_
* `logging`_

Expand Down Expand Up @@ -156,6 +157,15 @@ emails sent during development go to a single account.
This uses ``Swift_Plugins_RedirectingPlugin``. Original recipients are available
on the ``X-Swift-To``, ``X-Swift-Cc`` and ``X-Swift-Bcc`` headers.

delivery_whitelist
~~~~~~~~~~~~~~~~~~

**type**: ``array``

Used in combination with ``delivery_address``. If set, emails matching any of these
patterns will be delivered like normal, instead of being sent to `delivery_address`.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry, one last thing: you have to use double backticks for inline codeblocks in reStructured text.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, done that.

For details, see :ref:`the cookbook entry <sending-to-a-specified-address-but-with-exceptions>`

disable_delivery
~~~~~~~~~~~~~~~~

Expand Down