Skip to content

Commit 25d7f17

Browse files
committed
Merge branch '6.0' into 6.1
* 6.0: remove display names from envelope headers
2 parents 45fab1b + 2d26466 commit 25d7f17

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

mailer.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,6 @@ and headers.
502502
mailer:
503503
envelope:
504504
sender: 'fabien@example.com'
505-
# sender: 'Fabien <fabien@example.com>' (use this to add a display name)
506505
recipients: ['foo@example.com', 'bar@example.com']
507506
headers:
508507
From: 'Fabien <fabien@example.com>'
@@ -525,8 +524,6 @@ and headers.
525524
<framework:mailer>
526525
<framework:envelope>
527526
<framework:sender>fabien@example.com</framework:sender>
528-
<!-- use this to add a display name:
529-
<framework:sender>Fabien &lt;fabien@example.com&gt;</framework:sender> -->
530527
<framework:recipients>foo@example.com</framework:recipients>
531528
<framework:recipients>bar@example.com</framework:recipients>
532529
</framework:envelope>
@@ -547,7 +544,6 @@ and headers.
547544
$mailer
548545
->envelope()
549546
->sender('fabien@example.com')
550-
// ->sender('Fabien <fabien@example.com>') (use this to add a display name)
551547
->recipients(['foo@example.com', 'bar@example.com'])
552548
;
553549

0 commit comments

Comments
 (0)