From dd898fe6a015ab47405ac3851ba50ffd5bc1c22a Mon Sep 17 00:00:00 2001
From: kamal namdeo <kamal.github@gmail.com>
Date: Thu, 18 Feb 2016 12:38:07 +0530
Subject: Fix the language in engines guide

---
 guides/source/engines.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guides/source/engines.md b/guides/source/engines.md
index db50ad278f..fd940f4084 100644
--- a/guides/source/engines.md
+++ b/guides/source/engines.md
@@ -402,7 +402,7 @@ module Blorgh
 end
 ```
 
-NOTE: The `ApplicationController` class being inherited from here is the
+NOTE: The `ArticlesController` class inherits from
 `Blorgh::ApplicationController`, not an application's `ApplicationController`.
 
 The helper inside `app/helpers/blorgh/articles_helper.rb` is also namespaced:
-- 
cgit v1.2.3


From 6890043f4c50ee97d608964e35568fe4a346ee40 Mon Sep 17 00:00:00 2001
From: kamal namdeo <kamal.github@gmail.com>
Date: Thu, 18 Feb 2016 20:48:19 +0530
Subject: [ci skip] fix suggested change-replace 'an' with 'the in Rails engine
 guide'

---
 guides/source/engines.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guides/source/engines.md b/guides/source/engines.md
index fd940f4084..c5fc2f73b4 100644
--- a/guides/source/engines.md
+++ b/guides/source/engines.md
@@ -403,7 +403,7 @@ end
 ```
 
 NOTE: The `ArticlesController` class inherits from
-`Blorgh::ApplicationController`, not an application's `ApplicationController`.
+`Blorgh::ApplicationController`, not the application's `ApplicationController`.
 
 The helper inside `app/helpers/blorgh/articles_helper.rb` is also namespaced:
 
-- 
cgit v1.2.3