aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2015-12-20 21:16:27 +0100
committerKasper Timm Hansen <kaspth@gmail.com>2015-12-20 21:16:27 +0100
commit249e943a0d25f0014e14e52454e01205c9537019 (patch)
tree7b2285689ff59a98deef2561905ffeb0141a2c5d /guides
parent0207464f9b7a00d4916dbd9bc864515524097b7d (diff)
parentd4ee8a99530c3194e369a66bda2b8f7729cc6974 (diff)
downloadrails-249e943a0d25f0014e14e52454e01205c9537019.tar.gz
rails-249e943a0d25f0014e14e52454e01205c9537019.tar.bz2
rails-249e943a0d25f0014e14e52454e01205c9537019.zip
Merge pull request #22711 from jonatack/add-missing-period-in-upgrading-rails-guide
Upgrade Guide: Add missing period, :scissors: whitespace [skip ci]
Diffstat (limited to 'guides')
-rw-r--r--guides/source/upgrading_ruby_on_rails.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md
index 148890bf77..898d75c139 100644
--- a/guides/source/upgrading_ruby_on_rails.md
+++ b/guides/source/upgrading_ruby_on_rails.md
@@ -61,7 +61,7 @@ all models inherit from `ApplicationRecord`.
`ApplicationRecord` is a new superclass for all app models, analogous to app
controllers subclassing `ApplicationController` instead of
`ActionController::Base`. This gives apps a single spot to configure app-wide
-model behavior
+model behavior.
When upgrading from Rails 4.2 to Rails 5.0 you need to create an
`application_record.rb` file in `app/models/` and add the following content:
@@ -963,7 +963,7 @@ Please read [Pull Request #9978](https://github.com/rails/rails/pull/9978) for d
* Rails 4.0 has removed the XML parameters parser. You will need to add the `actionpack-xml_parser` gem if you require this feature.
-* Rails 4.0 changes the default `layout` lookup set using symbols or procs that return nil. To get the "no layout" behavior, return false instead of nil.
+* Rails 4.0 changes the default `layout` lookup set using symbols or procs that return nil. To get the "no layout" behavior, return false instead of nil.
* Rails 4.0 changes the default memcached client from `memcache-client` to `dalli`. To upgrade, simply add `gem 'dalli'` to your `Gemfile`.