aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer/base.rb
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2017-08-30 03:36:54 +0900
committerGitHub <noreply@github.com>2017-08-30 03:36:54 +0900
commit96742b5e0f04a2ed795032df04736cb1f16cc3a4 (patch)
treef49b15abda72948d007549e1350520c0ccd4cfe8 /actionmailer/lib/action_mailer/base.rb
parent711dd2294f5ac5735d4a3fac2bee6443008a82b8 (diff)
parent413bb9bd342b002c6242ba2333acec702e84ca3b (diff)
downloadrails-96742b5e0f04a2ed795032df04736cb1f16cc3a4.tar.gz
rails-96742b5e0f04a2ed795032df04736cb1f16cc3a4.tar.bz2
rails-96742b5e0f04a2ed795032df04736cb1f16cc3a4.zip
Merge pull request #30457 from yhirano55/update_action_mailer_doc
Update Action Mailer doc [ci skip]
Diffstat (limited to 'actionmailer/lib/action_mailer/base.rb')
-rw-r--r--actionmailer/lib/action_mailer/base.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index a54eb52dcb..1c1e1a9a3b 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -59,7 +59,7 @@ module ActionMailer
# The hash passed to the mail method allows you to specify any header that a <tt>Mail::Message</tt>
# will accept (any valid email header including optional fields).
#
- # The mail method, if not passed a block, will inspect your views and send all the views with
+ # 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.html.erb+ view file in a +multipart/alternative+ email.
#
@@ -138,7 +138,7 @@ module ActionMailer
# You can also define a <tt>default_url_options</tt> method on individual mailers to override these
# default settings per-mailer.
#
- # By default when <tt>config.force_ssl</tt> is true, URLs generated for hosts will use the HTTPS protocol.
+ # By default when <tt>config.force_ssl</tt> is +true+, URLs generated for hosts will use the HTTPS protocol.
#
# = Sending mail
#
@@ -316,7 +316,7 @@ module ActionMailer
#
# = Callbacks
#
- # You can specify callbacks using before_action and after_action for configuring your messages.
+ # You can specify callbacks using <tt>before_action</tt> and <tt>after_action</tt> for configuring your messages.
# This may be useful, for example, when you want to add default inline attachments for all
# messages sent out by a certain mailer class:
#