From e31e992ad847880069cfab913cce91c10998de9b Mon Sep 17 00:00:00 2001
From: Kasper Timm Hansen <kaspth@gmail.com>
Date: Tue, 21 Feb 2017 21:11:39 +0100
Subject: [ci skip] Fix typos in direct/resolve changelog.

---
 actionpack/CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack/CHANGELOG.md')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index b47bcf3820..0167dcbf96 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,7 +1,7 @@
 *   Prefer `remove_method` over `undef_method` when reloading routes
 
     When `undef_method` is used it prevents access to other implementations of that
-    url helper in the ancestor chain so use `remove_method` instead to restores access.
+    url helper in the ancestor chain so use `remove_method` instead to restore access.
 
     *Andrew White*
 
@@ -11,7 +11,7 @@
 
     ``` ruby
     resource :basket
-    direct(class: "Basket") { [:basket] }
+    resolve(class: "Basket") { [:basket] }
     ```
 
     ``` erb
-- 
cgit v1.2.3