Skip to content

Commit d2671ca

Browse files
committed
Change "swiftmailer" and "Swiftmailer" notation to "Swift Mailer"
1 parent 163571e commit d2671ca

File tree

11 files changed

+24
-24
lines changed

11 files changed

+24
-24
lines changed

book/http_fundamentals.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ So then, what *is* the Symfony2 *Framework*? The *Symfony2 Framework* is
551551
a PHP library that accomplishes two distinct tasks:
552552

553553
#. Provides a selection of components (i.e. the Symfony2 Components) and
554-
third-party libraries (e.g. `Swiftmailer`_ for sending emails);
554+
third-party libraries (e.g. `Swift Mailer`_ for sending emails);
555555

556556
#. Provides sensible configuration and a "glue" library that ties all of these
557557
pieces together.
@@ -577,4 +577,4 @@ sensible defaults. For more advanced users, the sky is the limit.
577577
.. _`Validator`: https://github.com/symfony/Validator
578578
.. _`Security`: https://github.com/symfony/Security
579579
.. _`Translation`: https://github.com/symfony/Translation
580-
.. _`Swiftmailer`: http://swiftmailer.org/
580+
.. _`Swift Mailer`: http://swiftmailer.org/

book/testing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,7 @@ The Client used by functional tests creates a Kernel that runs in a special
677677
in the ``test`` environment, you can tweak any of your application's settings
678678
specifically for testing.
679679

680-
For example, by default, the swiftmailer is configured to *not* actually
680+
For example, by default, the Swift Mailer is configured to *not* actually
681681
deliver emails in the ``test`` environment. You can see this under the ``swiftmailer``
682682
configuration option:
683683

contributing/code/tests.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ autoloaded from `vendor/` under the main root directory (see
2525
The test suite needs the following third-party libraries:
2626

2727
* Doctrine
28-
* Swiftmailer
28+
* Swift Mailer
2929
* Twig
3030
* Monolog
3131

cookbook/email/dev_environment.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,13 @@ Now, suppose you're sending an email to ``recipient@example.com``.
109109
}
110110
111111
In the ``dev`` environment, the email will instead be sent to ``dev@example.com``.
112-
Swiftmailer will add an extra header to the email, ``X-Swift-To``, containing
112+
Swift Mailer will add an extra header to the email, ``X-Swift-To``, containing
113113
the replaced address, so you can still see who it would have been sent to.
114114

115115
.. note::
116116

117117
In addition to the ``to`` addresses, this will also stop the email being
118-
sent to any ``CC`` and ``BCC`` addresses set for it. Swiftmailer will add
118+
sent to any ``CC`` and ``BCC`` addresses set for it. Swift Mailer will add
119119
additional headers to the email with the overridden addresses in them.
120120
These are ``X-Swift-Cc`` and ``X-Swift-Bcc`` for the ``CC`` and ``BCC``
121121
addresses respectively.

cookbook/email/email.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ How to send an Email
77
Sending emails is a classic task for any web application and one that has
88
special complications and potential pitfalls. Instead of recreating the wheel,
99
one solution to send emails is to use the ``SwiftmailerBundle``, which leverages
10-
the power of the `Swiftmailer`_ library.
10+
the power of the `Swift Mailer`_ library.
1111

1212
.. note::
1313

@@ -29,7 +29,7 @@ the power of the `Swiftmailer`_ library.
2929
Configuration
3030
-------------
3131

32-
Before using Swiftmailer, be sure to include its configuration. The only
32+
Before using Swift Mailer, be sure to include its configuration. The only
3333
mandatory configuration parameter is ``transport``:
3434

3535
.. configuration-block::
@@ -74,7 +74,7 @@ mandatory configuration parameter is ``transport``:
7474
'password' => "your_password",
7575
));
7676
77-
The majority of the Swiftmailer configuration deals with how the messages
77+
The majority of the Swift Mailer configuration deals with how the messages
7878
themselves should be delivered.
7979

8080
The following configuration attributes are available:
@@ -96,7 +96,7 @@ The following configuration attributes are available:
9696
Sending Emails
9797
--------------
9898

99-
The Swiftmailer library works by creating, configuring and then sending
99+
The Swift Mailer library works by creating, configuring and then sending
100100
``Swift_Message`` objects. The "mailer" is responsible for the actual delivery
101101
of the message and is accessible via the ``mailer`` service. Overall, sending
102102
an email is pretty straightforward::
@@ -123,7 +123,7 @@ To keep things decoupled, the email body has been stored in a template and
123123
rendered with the ``renderView()`` method.
124124

125125
The ``$message`` object supports many more options, such as including attachments,
126-
adding HTML content, and much more. Fortunately, Swiftmailer covers the topic
126+
adding HTML content, and much more. Fortunately, Swift Mailer covers the topic
127127
of `Creating Messages`_ in great detail in its documentation.
128128

129129
.. tip::
@@ -135,5 +135,5 @@ of `Creating Messages`_ in great detail in its documentation.
135135
* :doc:`dev_environment`
136136
* :doc:`spool`
137137

138-
.. _`Swiftmailer`: http://swiftmailer.org/
138+
.. _`Swift Mailer`: http://swiftmailer.org/
139139
.. _`Creating Messages`: http://swiftmailer.org/docs/messages.html

cookbook/email/gmail.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ How to use Gmail to send Emails
55
===============================
66

77
During development, instead of using a regular SMTP server to send emails, you
8-
might find using Gmail easier and more practical. The Swiftmailer bundle makes
8+
might find using Gmail easier and more practical. The ``SwiftmailerBundle`` makes
99
it really easy.
1010

1111
.. tip::

cookbook/email/spool.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ How to Spool Emails
66

77
When you are using the ``SwiftmailerBundle`` to send an email from a Symfony2
88
application, it will default to sending the email immediately. You may, however,
9-
want to avoid the performance hit of the communication between ``Swiftmailer``
9+
want to avoid the performance hit of the communication between Swift Mailer
1010
and the email transport, which could cause the user to wait for the next
1111
page to load while the email is sending. This can be avoided by choosing
12-
to "spool" the emails instead of sending them directly. This means that ``Swiftmailer``
12+
to "spool" the emails instead of sending them directly. This means that Swift Mailer
1313
does not attempt to send the email but instead saves the message to somewhere
1414
such as a file. Another process can then read from the spool and take care
1515
of sending the emails in the spool. Currently only spooling to file or memory is supported
16-
by ``Swiftmailer``.
16+
by Swift Mailer.
1717

1818
Spool using memory
1919
------------------

cookbook/email/testing.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ How to test that an Email is sent in a functional Test
55
======================================================
66

77
Sending e-mails with Symfony2 is pretty straightforward thanks to the
8-
``SwiftmailerBundle``, which leverages the power of the `Swiftmailer`_ library.
8+
``SwiftmailerBundle``, which leverages the power of the `Swift Mailer`_ library.
99

1010
To functionally test that an email was sent, and even assert the email subject,
1111
content or any other headers, you can use :ref:`the Symfony2 Profiler <internals-profiler>`.
@@ -67,4 +67,4 @@ to get information about the messages send on the previous request::
6767
}
6868
}
6969

70-
.. _Swiftmailer: http://swiftmailer.org/
70+
.. _`Swift Mailer`: http://swiftmailer.org/

cookbook/symfony1.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ The ``vendor/`` directory is basically equivalent to the ``lib/vendor/``
7777
directory in symfony1, which was the conventional directory for all vendor
7878
libraries and bundles. By default, you'll find the Symfony2 library files in
7979
this directory, along with several other dependent libraries such as Doctrine2,
80-
Twig and Swiftmailer. 3rd party Symfony2 bundles live somewhere in the
80+
Twig and Swift Mailer. 3rd party Symfony2 bundles live somewhere in the
8181
``vendor/``.
8282

8383
The ``web/`` Directory

quick_tour/the_architecture.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ PHP. Have a look at the default configuration:
184184
auto_generate_proxy_classes: "%kernel.debug%"
185185
auto_mapping: true
186186
187-
# Swiftmailer Configuration
187+
# Swift Mailer Configuration
188188
swiftmailer:
189189
transport: "%mailer_transport%"
190190
host: "%mailer_host%"

reference/configuration/swiftmailer.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.. index::
2-
single: Configuration reference; Swiftmailer
2+
single: Configuration reference; Swift Mailer
33

44
SwiftmailerBundle Configuration ("swiftmailer")
55
===============================================
@@ -8,7 +8,7 @@ This reference document is a work in progress. It should be accurate, but
88
all options are not yet fully covered. For a full list of the default configuration
99
options, see `Full Default Configuration`_
1010

11-
The ``swiftmailer`` key configures Symfony's integration with Swiftmailer,
11+
The ``swiftmailer`` key configures Symfony's integration with Swift Mailer,
1212
which is responsible for creating and delivering email messages.
1313

1414
Configuration
@@ -119,7 +119,7 @@ sender_address
119119

120120
If set, all messages will be delivered with this address as the "return path"
121121
address, which is where bounced messages should go. This is handled internally
122-
by Swiftmailer's ``Swift_Plugins_ImpersonatePlugin`` class.
122+
by Swift Mailer's ``Swift_Plugins_ImpersonatePlugin`` class.
123123

124124
antiflood
125125
~~~~~~~~~
@@ -166,7 +166,7 @@ logging
166166

167167
**type**: ``Boolean`` **default**: ``%kernel.debug%``
168168

169-
If true, Symfony's data collector will be activated for Swiftmailer and the
169+
If true, Symfony's data collector will be activated for Swift Mailer and the
170170
information will be available in the profiler.
171171

172172
Full Default Configuration

0 commit comments

Comments
 (0)