aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2015-10-22 20:48:03 +0200
committerXavier Noria <fxn@hashref.com>2015-10-22 20:48:54 +0200
commit23eb2e1a99044d14e1f3e280cc3ca9a839d4a392 (patch)
tree5bbcf79400ac634ed905dc5e376448caa32263c4 /guides
parentf1013d37c86e0c96dd17107a8d2a2136b3a07cfa (diff)
downloadrails-23eb2e1a99044d14e1f3e280cc3ca9a839d4a392.tar.gz
rails-23eb2e1a99044d14e1f3e280cc3ca9a839d4a392.tar.bz2
rails-23eb2e1a99044d14e1f3e280cc3ca9a839d4a392.zip
Revert "[ci skip] removed extra comma"
Reason: That one is an Oxford comma, as per our guidelines. See: http://edgeguides.rubyonrails.org/api_documentation_guidelines.html#comma This reverts commit f184cd34f9ef35ddf85a23c2fb02cc05d3fb26b3.
Diffstat (limited to 'guides')
-rw-r--r--guides/source/4_2_release_notes.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/4_2_release_notes.md b/guides/source/4_2_release_notes.md
index 20eb4fa7e3..8a59007420 100644
--- a/guides/source/4_2_release_notes.md
+++ b/guides/source/4_2_release_notes.md
@@ -37,7 +37,7 @@ Major Features
Active Job is a new framework in Rails 4.2. It is a common interface on top of
queuing systems like [Resque](https://github.com/resque/resque), [Delayed
Job](https://github.com/collectiveidea/delayed_job),
-[Sidekiq](https://github.com/mperham/sidekiq) and more.
+[Sidekiq](https://github.com/mperham/sidekiq), and more.
Jobs written with the Active Job API run on any of the supported queues thanks
to their respective adapters. Active Job comes pre-configured with an inline