Fix a few typos [ci skip]

3 files changed, 14 insertions, 12 deletions

diff --git a/actionpack/lib/action_controller/metal/url_for.rb b/actionpack/lib/action_controller/metal/url_for.rb
index fbaa90d521..5a0e5c62e4 100644
--- a/actionpack/lib/action_controller/metal/url_for.rb
+++ b/actionpack/lib/action_controller/metal/url_for.rb
@@ -5,9 +5,9 @@ module ActionController
   # In addition to <tt>AbstractController::UrlFor</tt>, this module accesses the HTTP layer to define
   # url options like the +host+. In order to do so, this module requires the host class
   # to implement +env+ which needs to be Rack-compatible and +request+
-  # which is either instance of +ActionDispatch::Request+ or an object
-  # that responds to <tt>host</tt>, <tt>optional_port</tt>, <tt>protocol</tt> and
-  # <tt>symbolized_path_parameter</tt> methods.
+  # which is either an instance of +ActionDispatch::Request+ or an object
+  # that responds to the +host+, +optional_port+, +protocol+ and
+  # +symbolized_path_parameter+ methods.
   #
   #   class RootUrl
   #     include ActionController::UrlFor
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
index ae0016d3d5..32a2cb4517 100644
--- a/activemodel/CHANGELOG.md
+++ b/activemodel/CHANGELOG.md
@@ -40,11 +40,11 @@
 
         cat = Cat.new
         cat.assign_attributes(name: "Gorby", status: "yawning")
-        cat.name # => 'Gorby'
-        cat.status => 'yawning'
+        cat.name   # => 'Gorby'
+        cat.status # => 'yawning'
         cat.assign_attributes(status: "sleeping")
-        cat.name # => 'Gorby'
-        cat.status => 'sleeping'
+        cat.name   # => 'Gorby'
+        cat.status # => 'sleeping'
 
     *Bogdan Gusiev*
 
diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md
index 5a6f267360..7666601bd7 100644
--- a/guides/source/upgrading_ruby_on_rails.md
+++ b/guides/source/upgrading_ruby_on_rails.md
@@ -77,18 +77,20 @@ See [#17227](https://github.com/rails/rails/pull/17227) for more details.
 
 ### ActiveJob jobs now inherent from ApplicationJob by default
 
-In Rails 4.2 an ActiveJob inherents from `ActiveJob::Base`. In Rails 5.0 this
-behaviour has changed to now inherent from `ApplicationJob`.
+In Rails 4.2 an ActiveJob inherits from `ActiveJob::Base`. In Rails 5.0 this
+behavior has changed to now inherit from `ApplicationJob`.
 
-When upgrading from Rails 4.2 to Rails 5.0 you need to create a file
-`application_job.rb` in `app/jobs/` and add the following content:
+When upgrading from Rails 4.2 to Rails 5.0 you need to create an
+`application_job.rb` file in `app/jobs/` and add the following content:
 
 ```
 class ApplicationJob < ActiveJob::Base
 end
 ```
 
-See [#19034](https://github.com/rails/rails/pull/19034) for more details
+Then make sure that all your job classes inherit from it.
+
+See [#19034](https://github.com/rails/rails/pull/19034) for more details.
 
 Upgrading from Rails 4.1 to Rails 4.2
 -------------------------------------