aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorZachary Scott <e@zzak.io>2014-08-21 08:44:50 -0700
committerZachary Scott <e@zzak.io>2014-08-21 08:44:50 -0700
commit54cf7c54221b97be62fe388560db4b28d3c8d62d (patch)
tree3aa88dfbebc7d61701a192c95d514863a65e7abe /guides
parent45463c44be77e8bc5f0fe43a263a2b09ffd0d298 (diff)
parent3941b8da9fcba93c30dd8dc89af648872b809e5e (diff)
downloadrails-54cf7c54221b97be62fe388560db4b28d3c8d62d.tar.gz
rails-54cf7c54221b97be62fe388560db4b28d3c8d62d.tar.bz2
rails-54cf7c54221b97be62fe388560db4b28d3c8d62d.zip
Merge pull request #16612 from loganhasson/master
[ci skip] Clarify Action Mailer/Active Job usage note
Diffstat (limited to 'guides')
-rw-r--r--guides/source/action_mailer_basics.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/guides/source/action_mailer_basics.md b/guides/source/action_mailer_basics.md
index 6b6ce145e4..f981d0da47 100644
--- a/guides/source/action_mailer_basics.md
+++ b/guides/source/action_mailer_basics.md
@@ -187,13 +187,13 @@ class UsersController < ApplicationController
end
```
-NOTE: By default Active Job is configured to execute the job `:inline`. So you can
-use `deliver_later` now to send the emails and when you decide to start sending the
-email from a background job you'll just have to setup Active Job to use a queueing
+NOTE: Active Job's default behavior is to execute jobs ':inline'. So, you can use
+`deliver_later` now to send emails, and when you later decide to start sending
+them from a background job, you'll only need to set up Active Job to use a queueing
backend (Sidekiq, Resque, etc).
-If you want to send the emails right away (from a cronjob for example) just
-call `deliver_now`:
+If you want to send emails right away (from a cronjob for example) just call
+`deliver_now`:
```ruby
class SendWeeklySummary