aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJon Moss <me@jonathanmoss.me>2016-05-19 15:41:59 -0400
committerJon Moss <me@jonathanmoss.me>2016-05-19 15:41:59 -0400
commitf58bd6ed22b0fea1cfe07eaf8b62940fcb104d7a (patch)
tree4c6a707c562ec546ba2a5aa0546ee8fc866c6b94 /actionpack
parentd6e7334d19c234d42904e4a70b5a76831731b114 (diff)
downloadrails-f58bd6ed22b0fea1cfe07eaf8b62940fcb104d7a.tar.gz
rails-f58bd6ed22b0fea1cfe07eaf8b62940fcb104d7a.tar.bz2
rails-f58bd6ed22b0fea1cfe07eaf8b62940fcb104d7a.zip
Add back in Oxford Comma
per [API documentation guidelines](http://edgeguides.rubyonrails.org/api_documentation_guidelines.html#oxford-comma) [ci skip]
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/routing.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing.rb b/actionpack/lib/action_dispatch/routing.rb
index 64f8636c52..dd6ac9db9c 100644
--- a/actionpack/lib/action_dispatch/routing.rb
+++ b/actionpack/lib/action_dispatch/routing.rb
@@ -121,7 +121,7 @@ module ActionDispatch
# get 'blog/edit' => :edit
# end
#
- # # provides named routes for show, delete and edit
+ # # provides named routes for show, delete, and edit
# link_to @article.title, blog_show_path(id: @article.id)
#
# == Pretty URLs