From 4547d87853f486a590090fb74446d55bbd1937ad Mon Sep 17 00:00:00 2001 From: Gourav Tiwari Date: Sun, 17 May 2015 10:41:27 -0700 Subject: [PATCH] formatting changes [ci skip] --- actionmailer/lib/action_mailer/base.rb | 11 ++++++----- 1 file 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 # ActionMailer::Base sets the following: # # * mime_version: "1.0" - # * charset: "UTF-8", - # * content_type: "text/plain", + # * charset: "UTF-8" + # * content_type: "text/plain" # * parts_order: [ "text/plain", "text/enriched", "text/html" ] # # parts_order and charset are not actually valid Mail::Message 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 ActionController::Base. # - # 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 before_action rather than after_action in your + # Action Mailer classes so that headers are parsed properly. # # = Previewing emails #