aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2015-08-07 16:12:13 +0200
committerKasper Timm Hansen <kaspth@gmail.com>2015-08-07 16:12:13 +0200
commit52c1464c0ee9294ece7af258bde5ec1cf5391019 (patch)
treed6dc9097e67a4906bd5c9b97986f7995e9c139c1
parentd96a1b62d7c957fcf4ab818ff06e6d5bfc6f3b2d (diff)
parent7a3566ea3f2fccb3ecaf6693c16a725237228de7 (diff)
downloadrails-52c1464c0ee9294ece7af258bde5ec1cf5391019.tar.gz
rails-52c1464c0ee9294ece7af258bde5ec1cf5391019.tar.bz2
rails-52c1464c0ee9294ece7af258bde5ec1cf5391019.zip
Merge pull request #21159 from tcopeland/fix_speling
Fix doc typo
-rw-r--r--guides/source/upgrading_ruby_on_rails.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md
index 17309d4b47..743241d7a0 100644
--- a/guides/source/upgrading_ruby_on_rails.md
+++ b/guides/source/upgrading_ruby_on_rails.md
@@ -75,7 +75,7 @@ warning by adding the following configuration to your `config/application.rb`:
See [#17227](https://github.com/rails/rails/pull/17227) for more details.
-### ActiveJob jobs now inherent from ApplicationJob by default
+### ActiveJob jobs now inherit from ApplicationJob by default
In Rails 4.2 an ActiveJob inherits from `ActiveJob::Base`. In Rails 5.0 this
behavior has changed to now inherit from `ApplicationJob`.