aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikel Lindsaar <mikel@rubyx.com>2011-01-18 11:19:08 +1100
committerMikel Lindsaar <mikel@rubyx.com>2011-01-18 12:06:20 +1100
commitb72cd29e53fac2c0aba94a14eb6863d004cdeae3 (patch)
treeb477243cf4778eca9946d8f6f6aca2957ec082a6
parent9d549986dd67df15ae45bb679ef1d9b40b4a1252 (diff)
downloadrails-b72cd29e53fac2c0aba94a14eb6863d004cdeae3.tar.gz
rails-b72cd29e53fac2c0aba94a14eb6863d004cdeae3.tar.bz2
rails-b72cd29e53fac2c0aba94a14eb6863d004cdeae3.zip
Fixing spelling
-rw-r--r--actionmailer/lib/action_mailer/base.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index d67d563181..8ed2e5ec5c 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -246,7 +246,7 @@ module ActionMailer #:nodoc:
# but Action Mailer translates them appropriately and sets the correct values.
#
# As you can pass in any header, you need to either quote the header as a string, or pass it in as
- # an underscorised symbol, so the following will work:
+ # an underscored symbol, so the following will work:
#
# class Notifier < ActionMailer::Base
# default 'Content-Transfer-Encoding' => '7bit',
@@ -298,7 +298,7 @@ module ActionMailer #:nodoc:
#
# * <tt>sendmail_settings</tt> - Allows you to override options for the <tt>:sendmail</tt> delivery method.
# * <tt>:location</tt> - The location of the sendmail executable. Defaults to <tt>/usr/sbin/sendmail</tt>.
- # * <tt>:arguments</tt> - The command line arguments. Defaults to <tt>-i -t</tt> with <tt>-f sender@addres</tt>
+ # * <tt>:arguments</tt> - The command line arguments. Defaults to <tt>-i -t</tt> with <tt>-f sender@address</tt>
# added automatically before the message is sent.
#
# * <tt>file_settings</tt> - Allows you to override options for the <tt>:file</tt> delivery method.