From 8038ad73c3f5d63f1bf155e45f78391f6ed5aa8f Mon Sep 17 00:00:00 2001 From: xelan Date: Fri, 25 Sep 2015 15:07:11 +0200 Subject: [PATCH 1/2] Describe configuration behaviour with multiple mailers --- reference/configuration/swiftmailer.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/reference/configuration/swiftmailer.rst b/reference/configuration/swiftmailer.rst index bae46b9ba33..22ddbaf9444 100644 --- a/reference/configuration/swiftmailer.rst +++ b/reference/configuration/swiftmailer.rst @@ -303,3 +303,9 @@ Each mailer is registered as a service:: // returns the second mailer $container->get('swiftmailer.mailer.second_mailer'); + +.. caution:: + + The configuration in the ``swiftmailer`` key (see above) is a shortcut + syntax for the default mailer. If you use multiple mailers, you need to + set options like ``disable_delivery`` separately for the additional mailers. From 067519d61154603fda804a570813eaf91b9b37d6 Mon Sep 17 00:00:00 2001 From: xelan Date: Wed, 30 Sep 2015 08:10:10 +0200 Subject: [PATCH 2/2] Change wording --- reference/configuration/swiftmailer.rst | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/reference/configuration/swiftmailer.rst b/reference/configuration/swiftmailer.rst index 22ddbaf9444..39d1ea1c8a7 100644 --- a/reference/configuration/swiftmailer.rst +++ b/reference/configuration/swiftmailer.rst @@ -306,6 +306,7 @@ Each mailer is registered as a service:: .. caution:: - The configuration in the ``swiftmailer`` key (see above) is a shortcut - syntax for the default mailer. If you use multiple mailers, you need to - set options like ``disable_delivery`` separately for the additional mailers. + When configuring multiple mailers, options must be placed under the appropriate + mailer key of the configuration. Options placed directly under the ``swiftmailer`` + key will not be applied to all mailers, but will configure a mailer named + ``default`` instead.