aboutsummaryrefslogtreecommitdiffstats
path: root/activejob
diff options
context:
space:
mode:
authorLogan Hasson <logan.hasson@gmail.com>2014-08-20 15:36:58 -0400
committerLogan Hasson <logan.hasson@gmail.com>2014-08-20 15:36:58 -0400
commitd694ea259c755924ba54e8e3783630ae3d737543 (patch)
tree2d6c9d776de877e49f2985dcdda4f279a3732b49 /activejob
parent2b7d67d49df8b88ef4815199f2ce5c11f09fe06f (diff)
downloadrails-d694ea259c755924ba54e8e3783630ae3d737543.tar.gz
rails-d694ea259c755924ba54e8e3783630ae3d737543.tar.bz2
rails-d694ea259c755924ba54e8e3783630ae3d737543.zip
[ci skip] Fix Active Job grammar in api docs
Diffstat (limited to 'activejob')
-rw-r--r--activejob/README.md2
-rw-r--r--activejob/lib/active_job/callbacks.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activejob/README.md b/activejob/README.md
index e48070bcfc..1f300fcf62 100644
--- a/activejob/README.md
+++ b/activejob/README.md
@@ -2,7 +2,7 @@
Active Job is a framework for declaring jobs and making them run on a variety
of queueing backends. These jobs can be everything from regularly scheduled
-clean-ups, billing charges, or mailings. Anything that can be chopped up into
+clean-ups, to billing charges, to mailings. Anything that can be chopped up into
small units of work and run in parallel, really.
It also serves as the backend for ActionMailer's #deliver_later functionality
diff --git a/activejob/lib/active_job/callbacks.rb b/activejob/lib/active_job/callbacks.rb
index af92031bc9..8901fa77f2 100644
--- a/activejob/lib/active_job/callbacks.rb
+++ b/activejob/lib/active_job/callbacks.rb
@@ -3,7 +3,7 @@ require 'active_support/callbacks'
module ActiveJob
# = Active Job Callbacks
#
- # Active Job provides hooks during the lifecycle of a job. Callbacks allows you to trigger
+ # Active Job provides hooks during the lifecycle of a job. Callbacks allow you to trigger
# logic during the lifecycle of a job. Available callbacks:
#
# * <tt>before_enqueue</tt>