aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/engines.md
diff options
context:
space:
mode:
authorJon Moss <maclover7@users.noreply.github.com>2016-09-17 15:56:30 -0400
committerGitHub <noreply@github.com>2016-09-17 15:56:30 -0400
commit7ccd32412e617884f21edb240df9030b8e3b58ea (patch)
tree7cba066de186657ac86e9fff566a95ccd32df57a /guides/source/engines.md
parent34d2aed03bf7edde8791e8728805a7b7b0d41045 (diff)
parente1252e073a6be072d82f0984332e851190323ef6 (diff)
downloadrails-7ccd32412e617884f21edb240df9030b8e3b58ea.tar.gz
rails-7ccd32412e617884f21edb240df9030b8e3b58ea.tar.bz2
rails-7ccd32412e617884f21edb240df9030b8e3b58ea.zip
Merge pull request #26534 from Neodelf/new_branch_name
[ci skip] Fixed commas according to Oxford comma in rdoc and guides
Diffstat (limited to 'guides/source/engines.md')
-rw-r--r--guides/source/engines.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/engines.md b/guides/source/engines.md
index 83c0a7f337..0020112a1c 100644
--- a/guides/source/engines.md
+++ b/guides/source/engines.md
@@ -184,7 +184,7 @@ end
By inheriting from the `Rails::Engine` class, this gem notifies Rails that
there's an engine at the specified path, and will correctly mount the engine
inside the application, performing tasks such as adding the `app` directory of
-the engine to the load path for models, mailers, controllers and views.
+the engine to the load path for models, mailers, controllers, and views.
The `isolate_namespace` method here deserves special notice. This call is
responsible for isolating the controllers, models, routes and other things into