delivery adresses are separate XML element nodes

xabbuh · xabbuh · commit 2c97e50b7918 · 2016-12-12T21:17:41.000+01:00
diff --git a/email/dev_environment.rst b/email/dev_environment.rst
@@ -78,7 +78,9 @@ via the ``delivery_addresses`` 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-addresses="dev@example.com" />
+            <swiftmailer:config>
+                <swiftmailer:delivery-address>dev@example.com</swiftmailer:delivery-address>
+            </swiftmailer:config>
         </container>
 
     .. code-block:: php
@@ -158,11 +160,12 @@ by adding the ``delivery_whitelist`` 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-addresses="dev@example.com">
+            <swiftmailer:config>
                 <!-- all email addresses matching these regexes will be delivered
                      like normal, as well as being sent to dev@example.com -->
                 <swiftmailer:delivery-whitelist-pattern>/@specialdomain\.com$/</swiftmailer:delivery-whitelist-pattern>
                 <swiftmailer:delivery-whitelist-pattern>/^admin@mydomain\.com$/</swiftmailer:delivery-whitelist-pattern>
+                <swiftmailer:delivery-address>dev@example.com</swiftmailer:delivery-address>
             </swiftmailer:config>
         </container>
 
diff --git a/reference/configuration/swiftmailer.rst b/reference/configuration/swiftmailer.rst
@@ -211,7 +211,6 @@ Full Default Configuration
             antiflood:
                 threshold:            99
                 sleep:                0
-            delivery_address:     ~
             delivery_addresses:   []
             disable_delivery:     ~
             logging:              '%kernel.debug%'
@@ -234,8 +233,6 @@ Full Default Configuration
                 encryption=""
                 auth_mode=""
                 sender_address=""
-                delivery_address=""
-                delivery_addresses=""
                 disable_delivery=""
                 logging="%kernel.debug%"
                 >
