Update Swiftmailer configuration docs

Added `delivery_addresses` configuration.

Author: jverdeyen

email.rst

@@ -83,7 +83,7 @@ The following configuration attributes are available:
 
   * ``type`` (how to queue the messages, ``file`` or ``memory`` is supported, see :doc:`/email/spool`)
   * ``path`` (where to store the messages)
-* ``delivery_address`` (an email address where to send ALL emails)
+* ``delivery_addresses`` (an array of email addresses where to send ALL emails)
 * ``disable_delivery`` (set to true to disable delivery completely)
 
 Sending Emails

email/dev_environment.rst

@@ -53,20 +53,20 @@ will not be sent when you run tests, but will continue to be sent in the
 If you'd also like to disable deliver in the ``dev`` environment, simply
 add this same configuration to the ``config_dev.yml`` file.
 
-Sending to a Specified Address
+Sending to a Specified Addresses
 ------------------------------
 
-You can also choose to have all email sent to a specific address, instead
+You can also choose to have all email sent to specific addresses, instead
 of the address actually specified when sending the message. This can be done
-via the ``delivery_address`` option:
+via the ``delivery_addresses`` option:
 
 .. configuration-block::
 
     .. code-block:: yaml
 
         # app/config/config_dev.yml
         swiftmailer:
-            delivery_address: 'dev@example.com'
+            delivery_addresses: ['dev@example.com']
 
     .. code-block:: xml
 
@@ -78,14 +78,14 @@ via the ``delivery_address`` option:
             xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
                 http://symfony.com/schema/dic/swiftmailer http://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd">
 
-            <swiftmailer:config delivery-address="dev@example.com" />
+            <swiftmailer:config delivery-addresses="dev@example.com" />
         </container>
 
     .. code-block:: php
 
         // app/config/config_dev.php
         $container->loadFromExtension('swiftmailer', array(
-            'delivery_address'  => "dev@example.com",
+            'delivery_address'  => array("dev@example.com"),
         ));
 
 Now, suppose you're sending an email to ``recipient@example.com``.
@@ -139,7 +139,7 @@ by adding the ``delivery_whitelist`` option:
 
         # app/config/config_dev.yml
         swiftmailer:
-            delivery_address: dev@example.com
+            delivery_addresses: dev@example.com
             delivery_whitelist:
                # all email addresses matching these regexes will be delivered
                # like normal, as well as being sent to dev@example.com
@@ -170,7 +170,7 @@ by adding the ``delivery_whitelist`` option:
 
         // app/config/config_dev.php
         $container->loadFromExtension('swiftmailer', array(
-            'delivery_address'  => "dev@example.com",
+            'delivery_addresses'  => array("dev@example.com"),
             'delivery_whitelist' => array(
                 // all email addresses matching these regexes will be delivered
                 // like normal, as well as being sent to dev@example.com

reference/configuration/swiftmailer.rst

@@ -32,7 +32,7 @@ Configuration
 * `antiflood`_
     * `threshold`_
     * `sleep`_
-* `delivery_address`_
+* `delivery_addresses`_
 * `delivery_whitelist`_
 * `disable_delivery`_
 * `logging`_
@@ -145,27 +145,29 @@ sleep
 Used with ``Swift_Plugins_AntiFloodPlugin``. This is the number of seconds
 to sleep for during a transport restart.
 
-delivery_address
+delivery_addresses
 ~~~~~~~~~~~~~~~~
 
-**type**: ``string``
+**type**: ``array``
 
-If set, all email messages will be sent to this address instead of being
+If set, all email messages will be sent to these addresses instead of being
 sent to their actual recipients. This is often useful when developing. For
 example, by setting this in the ``config_dev.yml`` file, you can guarantee
-that all emails sent during development go to a single account.
+that all emails sent during development go to the specified recipients.
 
 This uses ``Swift_Plugins_RedirectingPlugin``. Original recipients are available
 on the ``X-Swift-To``, ``X-Swift-Cc`` and ``X-Swift-Bcc`` headers.
 
+Warning: ``delivery_addresses`` was previously called ``delivery_address``.
+
 delivery_whitelist
 ~~~~~~~~~~~~~~~~~~
 
 **type**: ``array``
 
-Used in combination with ``delivery_address``. If set, emails matching any
+Used in combination with ``delivery_addresses``. If set, emails matching any
 of these patterns will be delivered like normal, as well as being sent to
-``delivery_address``. For details, see the
+``delivery_addresses``. For details, see the
 :ref:`How to Work with Emails during Development <sending-to-a-specified-address-but-with-exceptions>`
 article.
 
@@ -207,7 +209,7 @@ Full Default Configuration
             antiflood:
                 threshold:            99
                 sleep:                0
-            delivery_address:     ~
+            delivery_addresses:   ~
             disable_delivery:     ~
             logging:              '%kernel.debug%'
 
@@ -229,7 +231,7 @@ Full Default Configuration
                 encryption=""
                 auth_mode=""
                 sender_address=""
-                delivery_address=""
+                delivery_addresses=""
                 disable_delivery=""
                 logging="%kernel.debug%"
                 >