aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source
diff options
context:
space:
mode:
authorAndrew White <pixeltrix@users.noreply.github.com>2018-03-31 15:12:54 +0100
committerGitHub <noreply@github.com>2018-03-31 15:12:54 +0100
commitcbb054a0a9fb2a065254b026cf4d67763a39432d (patch)
tree5a986d6a02d2a0aa718bdc021b31e383a0573e13 /guides/source
parentb1a0ab179f23888eaadacd8292cbcec49ab06fdf (diff)
parentdf75a5a9ab99124492ce155b09bb83157eff035d (diff)
downloadrails-cbb054a0a9fb2a065254b026cf4d67763a39432d.tar.gz
rails-cbb054a0a9fb2a065254b026cf4d67763a39432d.tar.bz2
rails-cbb054a0a9fb2a065254b026cf4d67763a39432d.zip
Merge pull request #32395 from yhirano55/use_oxford_comma_style_in_guide
[ci skip] Use Oxford comma style in guide
Diffstat (limited to 'guides/source')
-rw-r--r--guides/source/_welcome.html.erb2
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/_welcome.html.erb b/guides/source/_welcome.html.erb
index 272f837c1c..cd33e2119a 100644
--- a/guides/source/_welcome.html.erb
+++ b/guides/source/_welcome.html.erb
@@ -23,6 +23,6 @@ The guides for earlier releases:
<a href="http://guides.rubyonrails.org/v4.0/">Rails 4.0</a>,
<a href="http://guides.rubyonrails.org/v3.2/">Rails 3.2</a>,
<a href="http://guides.rubyonrails.org/v3.1/">Rails 3.1</a>,
-<a href="http://guides.rubyonrails.org/v3.0/">Rails 3.0</a> and
+<a href="http://guides.rubyonrails.org/v3.0/">Rails 3.0</a>, and
<a href="http://guides.rubyonrails.org/v2.3/">Rails 2.3</a>.
</p>