From 0195619ad152d675c3261c0c907c2e6051f254c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20Br=C3=A5ten?= Date: Mon, 2 Mar 2015 19:53:33 +0000 Subject: [PATCH 1/5] [Reference] Add missing option delivery_whitelist Q | A -------- Doc fix? | yes New docs? | no Applies to | SwiftMailerBundle 2.1 Fixed tickets | no --- reference/configuration/swiftmailer.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/reference/configuration/swiftmailer.rst b/reference/configuration/swiftmailer.rst index 3aaf52b858a..69cd75208d0 100644 --- a/reference/configuration/swiftmailer.rst +++ b/reference/configuration/swiftmailer.rst @@ -32,6 +32,7 @@ Configuration * `threshold`_ * `sleep`_ * `delivery_address`_ +* `delivery_whitelist`_ * `disable_delivery`_ * `logging`_ @@ -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 ++~~~~~~~~~~~~~~~~~~ ++ ++**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 `the Cookbook entry.`_ + +.. _`the Cookbook entry.`: http://symfony.com/doc/current/cookbook/email/dev_environment.html#sending-to-a-specified-address-but-with-exceptions + disable_delivery ~~~~~~~~~~~~~~~~ From 07855f6790a1491a4ed28c9e5c78bad85ed802c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20Br=C3=A5ten?= Date: Mon, 2 Mar 2015 20:32:05 +0000 Subject: [PATCH 2/5] Removed + from copied diff --- reference/configuration/swiftmailer.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/reference/configuration/swiftmailer.rst b/reference/configuration/swiftmailer.rst index 69cd75208d0..96fc743cd58 100644 --- a/reference/configuration/swiftmailer.rst +++ b/reference/configuration/swiftmailer.rst @@ -158,11 +158,11 @@ 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 +~~~~~~~~~~~~~~~~~~ + +**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 `the Cookbook entry.`_ From ce8719df6e10a09a79ffe1b025d7301a11ded9ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20Br=C3=A5ten?= Date: Mon, 2 Mar 2015 20:54:51 +0000 Subject: [PATCH 3/5] Changed link into ref --- reference/configuration/swiftmailer.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/reference/configuration/swiftmailer.rst b/reference/configuration/swiftmailer.rst index 96fc743cd58..5286f97c721 100644 --- a/reference/configuration/swiftmailer.rst +++ b/reference/configuration/swiftmailer.rst @@ -164,9 +164,7 @@ delivery_whitelist 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 `the Cookbook entry.`_ - -.. _`the Cookbook entry.`: http://symfony.com/doc/current/cookbook/email/dev_environment.html#sending-to-a-specified-address-but-with-exceptions +For details, see :ref:`the cookbook entry ` disable_delivery ~~~~~~~~~~~~~~~~ From 2aab241b6f47ac0011d1a9ecef41cf0f49028d3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20Br=C3=A5ten?= Date: Mon, 2 Mar 2015 21:21:02 +0000 Subject: [PATCH 4/5] added link target/label in the cookbook --- cookbook/email/dev_environment.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cookbook/email/dev_environment.rst b/cookbook/email/dev_environment.rst index 45719625773..bf16761a78b 100644 --- a/cookbook/email/dev_environment.rst +++ b/cookbook/email/dev_environment.rst @@ -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 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ From 03279dc229bb05b6f4ffac4bc9521c2312256617 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20Br=C3=A5ten?= Date: Tue, 3 Mar 2015 09:34:36 +0000 Subject: [PATCH 5/5] Added double backticks. And also a full stop. --- reference/configuration/swiftmailer.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reference/configuration/swiftmailer.rst b/reference/configuration/swiftmailer.rst index 5286f97c721..d9614377bb3 100644 --- a/reference/configuration/swiftmailer.rst +++ b/reference/configuration/swiftmailer.rst @@ -163,8 +163,8 @@ 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 ` +patterns will be delivered like normal, instead of being sent to ``delivery_address``. +For details, see :ref:`the cookbook entry. ` disable_delivery ~~~~~~~~~~~~~~~~