aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2017-01-25 16:12:57 -0500
committerScott González <scott.gonzalez@gmail.com>2017-01-25 16:17:12 -0500
commit175e7efbc19d2d20bc6afd8ac801ede606c4e9bd (patch)
tree3ceb65d3595a45baeba26be5e868b5576dfcfd11
parent650e46afbcf21334c95af5814b6d00c01901dac2 (diff)
downloadrails-175e7efbc19d2d20bc6afd8ac801ede606c4e9bd.tar.gz
rails-175e7efbc19d2d20bc6afd8ac801ede606c4e9bd.tar.bz2
rails-175e7efbc19d2d20bc6afd8ac801ede606c4e9bd.zip
Action Mailer Basics clean up [ci skip]
-rw-r--r--guides/source/action_mailer_basics.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/action_mailer_basics.md b/guides/source/action_mailer_basics.md
index 1bf1a15529..380fdac658 100644
--- a/guides/source/action_mailer_basics.md
+++ b/guides/source/action_mailer_basics.md
@@ -525,7 +525,7 @@ By using the full URL, your links will now work in your emails.
#### Generating URLs with `url_for`
-`url_for` generate full URL by default in templates.
+`url_for` generates a full URL by default in templates.
If you did not configure the `:host` option globally make sure to pass it to
`url_for`.
@@ -574,7 +574,7 @@ Now you can display an image inside your email.
### Sending Multipart Emails
Action Mailer will automatically send multipart emails if you have different
-templates for the same action. So, for our UserMailer example, if you have
+templates for the same action. So, for our `UserMailer` example, if you have
`welcome_email.text.erb` and `welcome_email.html.erb` in
`app/views/user_mailer`, Action Mailer will automatically send a multipart email
with the HTML and text versions setup as different parts.