aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-02-05 17:17:01 -0200
committerRafael França <rafaelmfranca@gmail.com>2016-02-05 17:17:01 -0200
commitf4f998d60d0d095c7d49a26b6030bee4cf92a5d3 (patch)
treebb67f4018e308c12704183e7478a5e664b973318 /actionmailer
parent439fadf758f6f0bc50e3d8c6f96b0ddbd613d299 (diff)
parent8417d967e016f0219cc4ec30bf0d3908ce6cd29b (diff)
downloadrails-f4f998d60d0d095c7d49a26b6030bee4cf92a5d3.tar.gz
rails-f4f998d60d0d095c7d49a26b6030bee4cf92a5d3.tar.bz2
rails-f4f998d60d0d095c7d49a26b6030bee4cf92a5d3.zip
Merge pull request #23500 from akaspick/mailer_doc_fix
When generating a mailer, you must specify Mailer in the class name
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/lib/action_mailer/base.rb2
-rw-r--r--actionmailer/lib/rails/generators/mailer/USAGE2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index bb3cb1be45..8285a8618e 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -13,7 +13,7 @@ module ActionMailer
#
# To use Action Mailer, you need to create a mailer model.
#
- # $ rails generate mailer Notifier
+ # $ rails generate mailer NotifierMailer
#
# The generated model inherits from <tt>ApplicationMailer</tt> which in turn
# inherits from <tt>ActionMailer::Base</tt>. A mailer model defines methods
diff --git a/actionmailer/lib/rails/generators/mailer/USAGE b/actionmailer/lib/rails/generators/mailer/USAGE
index 2b0a078109..9f2a6b4cd8 100644
--- a/actionmailer/lib/rails/generators/mailer/USAGE
+++ b/actionmailer/lib/rails/generators/mailer/USAGE
@@ -8,7 +8,7 @@ Description:
Example:
========
- rails generate mailer Notifications signup forgot_password invoice
+ rails generate mailer NotificationsMailer signup forgot_password invoice
creates a Notifications mailer class, views, and test:
Mailer: app/mailers/notifications_mailer.rb