Skip to content

[Reference] Add missing option delivery_whitelist #5056

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

Merged
merged 5 commits into from
Mar 14, 2015
Merged

[Reference] Add missing option delivery_whitelist #5056

Changes from 1 commit
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
12 changes: 12 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,17 @@ 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
+~~~~~~~~~~~~~~~~~~
Copy link
Member

Choose a reason for hiding this comment

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

You have to remove the plus characters you copied from the old PR's diff. :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, forgot that. Done that now.

+
+**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 `the Cookbook entry.`_
Copy link
Member

Choose a reason for hiding this comment

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

Please use the ref role for internal links like this:

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

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, changed that.


.. _`the Cookbook entry.`: http://symfony.com/doc/current/cookbook/email/dev_environment.html#sending-to-a-specified-address-but-with-exceptions

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

Expand Down