aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-01-14 17:47:52 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-01-14 17:47:52 -0200
commit855cca0662f6a82b1eb450135f9c679e75723311 (patch)
treedf7da9a748b9bc9d971d9880c9e000f712d70bc7
parent9311d27c07d2e571294024765deb6c91b3a56b94 (diff)
parent29a2977af53685e434fd814d46c56b6766f34cd3 (diff)
downloadrails-855cca0662f6a82b1eb450135f9c679e75723311.tar.gz
rails-855cca0662f6a82b1eb450135f9c679e75723311.tar.bz2
rails-855cca0662f6a82b1eb450135f9c679e75723311.zip
Merge pull request #18521 from andrewvida/master
Correct the views that the mail method sends in API docs.
-rw-r--r--actionmailer/lib/action_mailer/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 53cc1fdb31..7eae76f93b 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -58,7 +58,7 @@ module ActionMailer
#
# The mail method, if not passed a block, will inspect your views and send all the views with
# the same name as the method, so the above action would send the +welcome.text.erb+ view
- # file as well as the +welcome.text.html.erb+ view file in a +multipart/alternative+ email.
+ # file as well as the +welcome.html.erb+ view file in a +multipart/alternative+ email.
#
# If you want to explicitly render only certain templates, pass a block:
#