diff options
| author | Gourav Tiwari <gouravtiwari21@gmail.com> | 2015-05-17 10:41:27 -0700 |
|---|---|---|
| committer | Gourav Tiwari <gouravtiwari21@gmail.com> | 2015-05-17 10:41:27 -0700 |
| commit | 4547d87853f486a590090fb74446d55bbd1937ad (patch) | |
| tree | 585e8ddb39cd3ca3ce1ba041e9e40667641acc97 /actionmailer/lib/action_mailer | |
| parent | bdc1e9c28cfdefba9aee62eb240c221f622b720d (diff) | |
| download | rails-4547d87853f486a590090fb74446d55bbd1937ad.tar.gz rails-4547d87853f486a590090fb74446d55bbd1937ad.tar.bz2 rails-4547d87853f486a590090fb74446d55bbd1937ad.zip | |
formatting changes [ci skip]
Diffstat (limited to 'actionmailer/lib/action_mailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 218b7a735a..4a5229fe18 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -257,8 +257,8 @@ module ActionMailer # <tt>ActionMailer::Base</tt> sets the following: # # * <tt>mime_version: "1.0"</tt> - # * <tt>charset: "UTF-8",</tt> - # * <tt>content_type: "text/plain",</tt> + # * <tt>charset: "UTF-8"</tt> + # * <tt>content_type: "text/plain"</tt> # * <tt>parts_order: [ "text/plain", "text/enriched", "text/html" ]</tt> # # <tt>parts_order</tt> and <tt>charset</tt> are not actually valid <tt>Mail::Message</tt> header fields, @@ -286,7 +286,7 @@ module ActionMailer # end # # Note that the proc is evaluated right at the start of the mail message generation, so if you - # set something in the defaults using a proc, and then set the same thing inside of your + # set something in the default using a proc, and then set the same thing inside of your # mailer method, it will get over written by the mailer method. # # It is also possible to set these default options that will be used in all mailers through @@ -319,8 +319,9 @@ module ActionMailer # callbacks in the same manner that you would use callbacks in classes that # inherit from <tt>ActionController::Base</tt>. # - # Note that unless you have a specific reason to do so, you should prefer using before_action - # rather than after_action in your Action Mailer classes so that headers are parsed properly. + # Note that unless you have a specific reason to do so, you should prefer + # using <tt>before_action</tt> rather than <tt>after_action</tt> in your + # Action Mailer classes so that headers are parsed properly. # # = Previewing emails # |