diff options
| author | Anthony Crumley <anthony.crumley@gmail.com> | 2018-05-08 21:48:07 -0500 |
|---|---|---|
| committer | Anthony Crumley <anthony.crumley@gmail.com> | 2018-05-10 12:46:06 -0500 |
| commit | 258670244dae39616a50ec1116f52e91b6f0bc62 (patch) | |
| tree | 6bb7d09613c9f8df3ec5e8e6661d338fde1b3153 /guides/source/action_mailer_basics.md | |
| parent | 2161b78336bb9c2b169063c22af10485ff9a93e7 (diff) | |
| download | rails-258670244dae39616a50ec1116f52e91b6f0bc62.tar.gz rails-258670244dae39616a50ec1116f52e91b6f0bc62.tar.bz2 rails-258670244dae39616a50ec1116f52e91b6f0bc62.zip | |
Added a lot of Oxford commas
[ci skip] A regular expression was used to find a lot of missing Oxford
commas and add them. The regular expression was as follows.
", ([a-zA-Z0-9.\`:'\"]+ ){1,6}(or|and) "
Diffstat (limited to 'guides/source/action_mailer_basics.md')
| -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 662f9ea38a..86d06508b0 100644 --- a/guides/source/action_mailer_basics.md +++ b/guides/source/action_mailer_basics.md @@ -238,7 +238,7 @@ params. The method `welcome_email` returns an `ActionMailer::MessageDelivery` object which can then just be told `deliver_now` or `deliver_later` to send itself out. The `ActionMailer::MessageDelivery` object is just a wrapper around a `Mail::Message`. If -you want to inspect, alter or do anything else with the `Mail::Message` object you can +you want to inspect, alter, or do anything else with the `Mail::Message` object you can access it with the `message` method on the `ActionMailer::MessageDelivery` object. ### Auto encoding header values @@ -270,7 +270,7 @@ Action Mailer makes it very easy to add attachments. * Pass the file name and content and Action Mailer and the [Mail gem](https://github.com/mikel/mail) will automatically guess the - mime_type, set the encoding and create the attachment. + mime_type, set the encoding, and create the attachment. ```ruby attachments['filename.jpg'] = File.read('/path/to/filename.jpg') |