Merge pull request rails#24487 from tomkadwill/action-mailer-base-docs

vipulnsward · vipulnsward · commit b8d1dbf9933e · 2016-04-10T19:08:15.000+05:30
Update ActionMailer Mailer Models and Views documentation [ci skip]
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
@@ -86,7 +86,7 @@ module ActionMailer
   # Like Action Controller, each mailer class has a corresponding view directory in which each
   # method of the class looks for a template with its name.
   #
-  # To define a template to be used with a mailing, create an <tt>.erb</tt> file with the same
+  # To define a template to be used with a mailer, create an <tt>.erb</tt> file with the same
   # name as the method in your mailer model. For example, in the mailer defined above, the template at
   # <tt>app/views/notifier_mailer/welcome.text.erb</tt> would be used to generate the email.
   #

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ module ActionMailer`
`86`	`86`	`# Like Action Controller, each mailer class has a corresponding view directory in which each`
`87`	`87`	`# method of the class looks for a template with its name.`
`88`	`88`	`#`
`89`		`- # To define a template to be used with a mailing, create an <tt>.erb</tt> file with the same`
	`89`	`+ # To define a template to be used with a mailer, create an <tt>.erb</tt> file with the same`
`90`	`90`	`# name as the method in your mailer model. For example, in the mailer defined above, the template at`
`91`	`91`	`# <tt>app/views/notifier_mailer/welcome.text.erb</tt> would be used to generate the email.`
`92`	`92`	`#`