diff options
| author | Matthew Eagar <meagar@gmail.com> | 2017-01-26 08:32:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-26 08:32:05 -0500 |
| commit | 4cf981f84637022bcf225afd3f13e088d3b0d154 (patch) | |
| tree | 88421e27bcf10b4dc4ae0beae62d2e8c198b8454 /guides/source | |
| parent | 255babc98b650db7469653aba6405a60efc9e608 (diff) | |
| parent | f543b97fcc52168119d4e016eb50afbda702e601 (diff) | |
| download | rails-4cf981f84637022bcf225afd3f13e088d3b0d154.tar.gz rails-4cf981f84637022bcf225afd3f13e088d3b0d154.tar.bz2 rails-4cf981f84637022bcf225afd3f13e088d3b0d154.zip | |
Merge branch 'master' into fix-missing-partial-iteration
Diffstat (limited to 'guides/source')
| -rw-r--r-- | guides/source/action_mailer_basics.md | 4 |
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. |