diff options
| author | Jon Moss <maclover7@users.noreply.github.com> | 2016-09-17 15:56:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-17 15:56:30 -0400 |
| commit | 7ccd32412e617884f21edb240df9030b8e3b58ea (patch) | |
| tree | 7cba066de186657ac86e9fff566a95ccd32df57a /guides | |
| parent | 34d2aed03bf7edde8791e8728805a7b7b0d41045 (diff) | |
| parent | e1252e073a6be072d82f0984332e851190323ef6 (diff) | |
| download | rails-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')
| -rw-r--r-- | guides/source/active_record_querying.md | 2 | ||||
| -rw-r--r-- | guides/source/engines.md | 2 | ||||
| -rw-r--r-- | guides/source/layouts_and_rendering.md | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/guides/source/active_record_querying.md b/guides/source/active_record_querying.md index 644756906a..bbe1b0decc 100644 --- a/guides/source/active_record_querying.md +++ b/guides/source/active_record_querying.md @@ -50,7 +50,7 @@ class Role < ApplicationRecord end ``` -Active Record will perform queries on the database for you and is compatible with most database systems, including MySQL, MariaDB, PostgreSQL and SQLite. Regardless of which database system you're using, the Active Record method format will always be the same. +Active Record will perform queries on the database for you and is compatible with most database systems, including MySQL, MariaDB, PostgreSQL, and SQLite. Regardless of which database system you're using, the Active Record method format will always be the same. Retrieving Objects from the Database ------------------------------------ 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 diff --git a/guides/source/layouts_and_rendering.md b/guides/source/layouts_and_rendering.md index 2722789c49..ad8ec15071 100644 --- a/guides/source/layouts_and_rendering.md +++ b/guides/source/layouts_and_rendering.md @@ -749,7 +749,7 @@ When Rails renders a view as a response, it does so by combining the view with t ### Asset Tag Helpers -Asset tag helpers provide methods for generating HTML that link views to feeds, JavaScript, stylesheets, images, videos and audios. There are six asset tag helpers available in Rails: +Asset tag helpers provide methods for generating HTML that link views to feeds, JavaScript, stylesheets, images, videos, and audios. There are six asset tag helpers available in Rails: * `auto_discovery_link_tag` * `javascript_include_tag` |