aboutsummaryrefslogtreecommitdiffstats
path: root/activejob/lib
diff options
context:
space:
mode:
authorZachary Scott <e@zzak.io>2014-11-02 01:21:11 -0700
committerZachary Scott <e@zzak.io>2014-11-02 01:21:11 -0700
commit26126c85334356e8fab7892dd30b2dc24a28c68e (patch)
tree00045ebcbba8bb2702f67cde8933a0775ac9fc9f /activejob/lib
parent8b611b705b668d98ad2b7cf166f7e99cffca6ba3 (diff)
parent19f6ac929bff5cb6ae95a26e8da29b20f5c4d146 (diff)
downloadrails-26126c85334356e8fab7892dd30b2dc24a28c68e.tar.gz
rails-26126c85334356e8fab7892dd30b2dc24a28c68e.tar.bz2
rails-26126c85334356e8fab7892dd30b2dc24a28c68e.zip
Merge pull request #17469 from rishijain/update_docs_2
added punctuations, and role of queue_adapter module [ci skip]
Diffstat (limited to 'activejob/lib')
-rw-r--r--activejob/lib/active_job/queue_adapter.rb2
-rw-r--r--activejob/lib/active_job/queue_adapters/delayed_job_adapter.rb4
2 files changed, 4 insertions, 2 deletions
diff --git a/activejob/lib/active_job/queue_adapter.rb b/activejob/lib/active_job/queue_adapter.rb
index 4bd28522ab..b42ec3b638 100644
--- a/activejob/lib/active_job/queue_adapter.rb
+++ b/activejob/lib/active_job/queue_adapter.rb
@@ -2,6 +2,8 @@ require 'active_job/queue_adapters/inline_adapter'
require 'active_support/core_ext/string/inflections'
module ActiveJob
+ # The <tt>ActionJob::QueueAdapter</tt> module is used to load the
+ # correct adapter. The default queue adapter is the :inline queue.
module QueueAdapter #:nodoc:
extend ActiveSupport::Concern
diff --git a/activejob/lib/active_job/queue_adapters/delayed_job_adapter.rb b/activejob/lib/active_job/queue_adapters/delayed_job_adapter.rb
index 4d27c4fff8..69d9e70de3 100644
--- a/activejob/lib/active_job/queue_adapters/delayed_job_adapter.rb
+++ b/activejob/lib/active_job/queue_adapters/delayed_job_adapter.rb
@@ -6,10 +6,10 @@ module ActiveJob
#
# Delayed::Job (or DJ) encapsulates the common pattern of asynchronously
# executing longer tasks in the background. Although DJ can have many
- # storage backends one of the most used is based on Active Record.
+ # storage backends, one of the most used is based on Active Record.
# Read more about Delayed Job {here}[https://github.com/collectiveidea/delayed_job].
#
- # To use Delayed Job set the queue_adapter config to +:delayed_job+.
+ # To use Delayed Job, set the queue_adapter config to +:delayed_job+.
#
# Rails.application.config.active_job.queue_adapter = :delayed_job
class DelayedJobAdapter