Merge branch '6.1' into 6.2

javiereguiluz · javiereguiluz · commit 7fb696ad60cc · 2022-09-22T17:43:33.000+02:00
* 6.1:
  Update example to use Address format
diff --git a/mailer.rst b/mailer.rst
@@ -522,6 +522,7 @@ and headers.
             mailer:
                 envelope:
                     sender: 'fabien@example.com'
+                    # sender: 'Fabien <fabien@example.com>' (use this to add a display name)
                     recipients: ['foo@example.com', 'bar@example.com']
                 headers:
                     From: 'Fabien <fabien@example.com>'
@@ -544,6 +545,8 @@ and headers.
                 <framework:mailer>
                     <framework:envelope>
                         <framework:sender>fabien@example.com</framework:sender>
+                        <!-- use this to add a display name:
+                        <framework:sender>Fabien &lt;fabien@example.com&gt;</framework:sender> -->
                         <framework:recipients>foo@example.com</framework:recipients>
                         <framework:recipients>bar@example.com</framework:recipients>
                     </framework:envelope>
@@ -564,6 +567,7 @@ and headers.
             $mailer
                 ->envelope()
                     ->sender('fabien@example.com')
+                    // ->sender('Fabien <fabien@example.com>') (use this to add a display name)
                     ->recipients(['foo@example.com', 'bar@example.com'])
             ;
 

-Original file line number
+Diff line change
             mailer:
                 envelope:
                     sender: '[email protected]'
 +                    # sender: 'Fabien <[email protected]>' (use this to add a display name)
                     recipients: ['[email protected]', '[email protected]']
                 headers:
                     From: 'Fabien <[email protected]>'
                 <framework:mailer>
                     <framework:envelope>
                         <framework:sender>[email protected]</framework:sender>
 +                        <!-- use this to add a display name:
 +                        <framework:sender>Fabien &lt;[email protected]&gt;</framework:sender> -->
                         <framework:recipients>[email protected]</framework:recipients>
                         <framework:recipients>[email protected]</framework:recipients>
                     </framework:envelope>
             $mailer
                 ->envelope()
                     ->sender('[email protected]')
 +                    // ->sender('Fabien <fabien@example.com>') (use this to add a display name)
                     ->recipients(['[email protected]', '[email protected]'])
+            ;