aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorEvgeniy Dolzhenko <dolzenko@gmail.com>2010-06-11 14:15:34 +0400
committerEvgeniy Dolzhenko <dolzenko@gmail.com>2010-06-11 14:15:34 +0400
commitccf9577aee86ce1f766c5e8854e0c285dc38f8ac (patch)
tree7d7aae452ebfeb8ae30016ceffd0e8686bbf1b57 /actionmailer
parent2148e2cc943f17544f1288e742954fdaa8a92d62 (diff)
downloadrails-ccf9577aee86ce1f766c5e8854e0c285dc38f8ac.tar.gz
rails-ccf9577aee86ce1f766c5e8854e0c285dc38f8ac.tar.bz2
rails-ccf9577aee86ce1f766c5e8854e0c285dc38f8ac.zip
Fix a bunch of minor spelling mistakes
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/lib/action_mailer/base.rb8
-rw-r--r--actionmailer/lib/action_mailer/deprecated_api.rb2
2 files changed, 5 insertions, 5 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 7da033b6af..f0b2604a66 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -60,21 +60,21 @@ module ActionMailer #:nodoc:
#
# If you want to explicitly render only certain templates, pass a block:
#
- # mail(:to => user.emai) do |format|
+ # mail(:to => user.email) do |format|
# format.text
# format.html
# end
#
# The block syntax is useful if also need to specify information specific to a part:
#
- # mail(:to => user.emai) do |format|
+ # mail(:to => user.email) do |format|
# format.text(:content_transfer_encoding => "base64")
# format.html
# end
#
# Or even to render a special view:
#
- # mail(:to => user.emai) do |format|
+ # mail(:to => user.email) do |format|
# format.text
# format.html { render "some_other_template" }
# end
@@ -182,7 +182,7 @@ module ActionMailer #:nodoc:
# end
#
# Which will (if it had both a <tt>welcome.text.plain.erb</tt> and <tt>welcome.text.html.erb</tt>
- # tempalte in the view directory), send a complete <tt>multipart/mixed</tt> email with two parts,
+ # template in the view directory), send a complete <tt>multipart/mixed</tt> email with two parts,
# the first part being a <tt>multipart/alternative</tt> with the text and HTML email parts inside,
# and the second being a <tt>application/pdf</tt> with a Base64 encoded copy of the file.pdf book
# with the filename +free_book.pdf+.
diff --git a/actionmailer/lib/action_mailer/deprecated_api.rb b/actionmailer/lib/action_mailer/deprecated_api.rb
index c08ab4164e..0070d8e016 100644
--- a/actionmailer/lib/action_mailer/deprecated_api.rb
+++ b/actionmailer/lib/action_mailer/deprecated_api.rb
@@ -1,7 +1,7 @@
module ActionMailer
# This is the API which is deprecated and is going to be removed on Rails 3.1 release.
# Part of the old API will be deprecated after 3.1, for a smoother deprecation process.
- # Chech those in OldApi instead.
+ # Check those in OldApi instead.
module DeprecatedApi #:nodoc:
extend ActiveSupport::Concern