Change "swiftmailer" and "Swiftmailer" notation to "Swift Mailer"

bicpi · bicpi · commit d2671cac093c · 2013-11-10T09:23:37.000+01:00
diff --git a/book/http_fundamentals.rst b/book/http_fundamentals.rst
@@ -551,7 +551,7 @@ So then, what *is* the Symfony2 *Framework*? The *Symfony2 Framework* is
 a PHP library that accomplishes two distinct tasks:
 
 #. Provides a selection of components (i.e. the Symfony2 Components) and
-   third-party libraries (e.g. `Swiftmailer`_ for sending emails);
+   third-party libraries (e.g. `Swift Mailer`_ for sending emails);
 
 #. Provides sensible configuration and a "glue" library that ties all of these
    pieces together.
@@ -577,4 +577,4 @@ sensible defaults. For more advanced users, the sky is the limit.
 .. _`Validator`: https://github.com/symfony/Validator
 .. _`Security`: https://github.com/symfony/Security
 .. _`Translation`: https://github.com/symfony/Translation
-.. _`Swiftmailer`: http://swiftmailer.org/
+.. _`Swift Mailer`: http://swiftmailer.org/
diff --git a/book/testing.rst b/book/testing.rst
@@ -677,7 +677,7 @@ The Client used by functional tests creates a Kernel that runs in a special
 in the ``test`` environment, you can tweak any of your application's settings
 specifically for testing.
 
-For example, by default, the swiftmailer is configured to *not* actually
+For example, by default, the Swift Mailer is configured to *not* actually
 deliver emails in the ``test`` environment. You can see this under the ``swiftmailer``
 configuration option:
 
diff --git a/contributing/code/tests.rst b/contributing/code/tests.rst
@@ -25,7 +25,7 @@ autoloaded from `vendor/` under the main root directory (see
 The test suite needs the following third-party libraries:
 
 * Doctrine
-* Swiftmailer
+* Swift Mailer
 * Twig
 * Monolog
 
diff --git a/cookbook/email/dev_environment.rst b/cookbook/email/dev_environment.rst
@@ -109,13 +109,13 @@ Now, suppose you're sending an email to ``recipient@example.com``.
     }
 
 In the ``dev`` environment, the email will instead be sent to ``dev@example.com``.
-Swiftmailer will add an extra header to the email, ``X-Swift-To``, containing
+Swift Mailer will add an extra header to the email, ``X-Swift-To``, containing
 the replaced address, so you can still see who it would have been sent to.
 
 .. note::
 
     In addition to the ``to`` addresses, this will also stop the email being
-    sent to any ``CC`` and ``BCC`` addresses set for it. Swiftmailer will add
+    sent to any ``CC`` and ``BCC`` addresses set for it. Swift Mailer will add
     additional headers to the email with the overridden addresses in them.
     These are ``X-Swift-Cc`` and ``X-Swift-Bcc`` for the ``CC`` and ``BCC``
     addresses respectively.
diff --git a/cookbook/email/email.rst b/cookbook/email/email.rst
@@ -7,7 +7,7 @@ How to send an Email
 Sending emails is a classic task for any web application and one that has
 special complications and potential pitfalls. Instead of recreating the wheel,
 one solution to send emails is to use the ``SwiftmailerBundle``, which leverages
-the power of the `Swiftmailer`_ library.
+the power of the `Swift Mailer`_ library.
 
 .. note::
 
@@ -29,7 +29,7 @@ the power of the `Swiftmailer`_ library.
 Configuration
 -------------
 
-Before using Swiftmailer, be sure to include its configuration. The only
+Before using Swift Mailer, be sure to include its configuration. The only
 mandatory configuration parameter is ``transport``:
 
 .. configuration-block::
@@ -74,7 +74,7 @@ mandatory configuration parameter is ``transport``:
             'password'   => "your_password",
         ));
 
-The majority of the Swiftmailer configuration deals with how the messages
+The majority of the Swift Mailer configuration deals with how the messages
 themselves should be delivered.
 
 The following configuration attributes are available:
@@ -96,7 +96,7 @@ The following configuration attributes are available:
 Sending Emails
 --------------
 
-The Swiftmailer library works by creating, configuring and then sending
+The Swift Mailer library works by creating, configuring and then sending
 ``Swift_Message`` objects. The "mailer" is responsible for the actual delivery
 of the message and is accessible via the ``mailer`` service. Overall, sending
 an email is pretty straightforward::
@@ -123,7 +123,7 @@ To keep things decoupled, the email body has been stored in a template and
 rendered with the ``renderView()`` method.
 
 The ``$message`` object supports many more options, such as including attachments,
-adding HTML content, and much more. Fortunately, Swiftmailer covers the topic
+adding HTML content, and much more. Fortunately, Swift Mailer covers the topic
 of `Creating Messages`_ in great detail in its documentation.
 
 .. tip::
@@ -135,5 +135,5 @@ of `Creating Messages`_ in great detail in its documentation.
     * :doc:`dev_environment`
     * :doc:`spool`
 
-.. _`Swiftmailer`: http://swiftmailer.org/
+.. _`Swift Mailer`: http://swiftmailer.org/
 .. _`Creating Messages`: http://swiftmailer.org/docs/messages.html
diff --git a/cookbook/email/gmail.rst b/cookbook/email/gmail.rst
@@ -5,7 +5,7 @@ How to use Gmail to send Emails
 ===============================
 
 During development, instead of using a regular SMTP server to send emails, you
-might find using Gmail easier and more practical. The Swiftmailer bundle makes
+might find using Gmail easier and more practical. The ``SwiftmailerBundle`` makes
 it really easy.
 
 .. tip::
diff --git a/cookbook/email/spool.rst b/cookbook/email/spool.rst
@@ -6,14 +6,14 @@ How to Spool Emails
 
 When you are using the ``SwiftmailerBundle`` to send an email from a Symfony2
 application, it will default to sending the email immediately. You may, however,
-want to avoid the performance hit of the communication between ``Swiftmailer``
+want to avoid the performance hit of the communication between Swift Mailer
 and the email transport, which could cause the user to wait for the next
 page to load while the email is sending. This can be avoided by choosing
-to "spool" the emails instead of sending them directly. This means that ``Swiftmailer``
+to "spool" the emails instead of sending them directly. This means that Swift Mailer
 does not attempt to send the email but instead saves the message to somewhere
 such as a file. Another process can then read from the spool and take care
 of sending the emails in the spool. Currently only spooling to file or memory is supported
-by ``Swiftmailer``.
+by Swift Mailer.
 
 Spool using memory
 ------------------
diff --git a/cookbook/email/testing.rst b/cookbook/email/testing.rst
@@ -5,7 +5,7 @@ How to test that an Email is sent in a functional Test
 ======================================================
 
 Sending e-mails with Symfony2 is pretty straightforward thanks to the
-``SwiftmailerBundle``, which leverages the power of the `Swiftmailer`_ library.
+``SwiftmailerBundle``, which leverages the power of the `Swift Mailer`_ library.
 
 To functionally test that an email was sent, and even assert the email subject,
 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::
         }
     }
 
-.. _Swiftmailer: http://swiftmailer.org/
+.. _`Swift Mailer`: http://swiftmailer.org/
diff --git a/cookbook/symfony1.rst b/cookbook/symfony1.rst
@@ -77,7 +77,7 @@ The ``vendor/`` directory is basically equivalent to the ``lib/vendor/``
 directory in symfony1, which was the conventional directory for all vendor
 libraries and bundles. By default, you'll find the Symfony2 library files in
 this directory, along with several other dependent libraries such as Doctrine2,
-Twig and Swiftmailer. 3rd party Symfony2 bundles live somewhere in the
+Twig and Swift Mailer. 3rd party Symfony2 bundles live somewhere in the
 ``vendor/``.
 
 The ``web/`` Directory
diff --git a/quick_tour/the_architecture.rst b/quick_tour/the_architecture.rst
@@ -184,7 +184,7 @@ PHP. Have a look at the default configuration:
             auto_generate_proxy_classes: "%kernel.debug%"
             auto_mapping: true
 
-    # Swiftmailer Configuration
+    # Swift Mailer Configuration
     swiftmailer:
         transport: "%mailer_transport%"
         host:      "%mailer_host%"
diff --git a/reference/configuration/swiftmailer.rst b/reference/configuration/swiftmailer.rst
@@ -1,5 +1,5 @@
 .. index::
-   single: Configuration reference; Swiftmailer
+   single: Configuration reference; Swift Mailer
 
 SwiftmailerBundle Configuration ("swiftmailer")
 ===============================================
@@ -8,7 +8,7 @@ This reference document is a work in progress. It should be accurate, but
 all options are not yet fully covered. For a full list of the default configuration
 options, see `Full Default Configuration`_
 
-The ``swiftmailer`` key configures Symfony's integration with Swiftmailer,
+The ``swiftmailer`` key configures Symfony's integration with Swift Mailer,
 which is responsible for creating and delivering email messages.
 
 Configuration
@@ -119,7 +119,7 @@ sender_address
 
 If set, all messages will be delivered with this address as the "return path"
 address, which is where bounced messages should go. This is handled internally
-by Swiftmailer's ``Swift_Plugins_ImpersonatePlugin`` class.
+by Swift Mailer's ``Swift_Plugins_ImpersonatePlugin`` class.
 
 antiflood
 ~~~~~~~~~
@@ -166,7 +166,7 @@ logging
 
 **type**: ``Boolean`` **default**: ``%kernel.debug%``
 
-If true, Symfony's data collector will be activated for Swiftmailer and the
+If true, Symfony's data collector will be activated for Swift Mailer and the
 information will be available in the profiler.
 
 Full Default Configuration

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ How to test that an Email is sent in a functional Test`
`5`	`5`	`======================================================`
`6`	`6`
`7`	`7`	`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.
`9`	`9`
`10`	`10`	`To functionally test that an email was sent, and even assert the email subject,`
`11`	`11`	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::`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
`70`		`-.. _Swiftmailer: http://swiftmailer.org/`
	`70`	+.. _`Swift Mailer`: http://swiftmailer.org/