Skip to content

Commit

Permalink
feature #5056 [Reference] Add missing option delivery_whitelist (Terj…
Browse files Browse the repository at this point in the history
…eBr)

This PR was merged into the 2.3 branch.

Discussion
----------

  [Reference] Add missing option delivery_whitelist

Q | A
---|---
Doc fix? |	yes
New docs? | no
Applies to | SwiftMailerBundle 2.1
Fixed tickets | #4925

Commits
-------

03279dc Added double backticks. And also a full stop.
2aab241 added link target/label in the cookbook
ce8719d Changed link into ref
07855f6 Removed + from copied diff
0195619   [Reference] Add missing option delivery_whitelist
  • Loading branch information
weaverryan committed Mar 14, 2015
2 parents 2fe8f76 + 03279dc commit 65dd03b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
2 changes: 2 additions & 0 deletions cookbook/email/dev_environment.rst
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
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``.
For details, see :ref:`the cookbook entry. <sending-to-a-specified-address-but-with-exceptions>`

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

Expand Down

0 comments on commit 65dd03b

Please sign in to comment.