aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2018-04-30 17:29:17 -0400
committerGitHub <noreply@github.com>2018-04-30 17:29:17 -0400
commit39f2f57635198f1b8ae175d2a8f4183ea6daa951 (patch)
tree27ebe8bae75c7b21f334c2d4a5d58c27be202c01
parent5909cdb9625ce92ccee8dae534ab175c4f6efe00 (diff)
parent7549f830a2b5e2ae7fcfc8f471551f0be0922cca (diff)
downloadrails-39f2f57635198f1b8ae175d2a8f4183ea6daa951.tar.gz
rails-39f2f57635198f1b8ae175d2a8f4183ea6daa951.tar.bz2
rails-39f2f57635198f1b8ae175d2a8f4183ea6daa951.zip
Merge pull request #32768 from anthonycrumley/fix-oxford-comma
Fix an oxford comma
-rw-r--r--guides/source/getting_started.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/getting_started.md b/guides/source/getting_started.md
index 9dab7a9d6f..c1e4e443ed 100644
--- a/guides/source/getting_started.md
+++ b/guides/source/getting_started.md
@@ -167,7 +167,7 @@ of the files and folders that Rails created by default:
| File/Folder | Purpose |
| ----------- | ------- |
-|app/|Contains the controllers, models, views, helpers, mailers, channels, jobs and assets for your application. You'll focus on this folder for the remainder of this guide.|
+|app/|Contains the controllers, models, views, helpers, mailers, channels, jobs, and assets for your application. You'll focus on this folder for the remainder of this guide.|
|bin/|Contains the rails script that starts your app and can contain other scripts you use to setup, update, deploy, or run your application.|
|config/|Configure your application's routes, database, and more. This is covered in more detail in [Configuring Rails Applications](configuring.html).|
|config.ru|Rack configuration for Rack based servers used to start the application. For more information about Rack, see the [Rack website](https://rack.github.io/).|