diff options
| author | Prem Sichanugrist <s@sikac.hu> | 2019-07-30 18:58:14 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-30 18:58:14 +0900 |
| commit | bd822a45bef35493d131d716018fc212203d40f9 (patch) | |
| tree | 3fa13b84dc87ad6a18e689ad67a80190dfd17b7a | |
| parent | 1e5c0a7836840be03c370d121c1cdefc1034595e (diff) | |
| parent | 56b3f79254926c258712cd734d14c55adae5fb3f (diff) | |
| download | rails-bd822a45bef35493d131d716018fc212203d40f9.tar.gz rails-bd822a45bef35493d131d716018fc212203d40f9.tar.bz2 rails-bd822a45bef35493d131d716018fc212203d40f9.zip | |
Merge pull request #36812 from nigh7m4r3/readme-comma-usage
Fix comma usage on project's README.md
[ci skip]
| -rw-r--r-- | README.md | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -25,7 +25,7 @@ the [Active Model](activemodel/README.rdoc) module. ## Controller layer The _**Controller layer**_ is responsible for handling incoming HTTP requests and -providing a suitable response. Usually this means returning HTML, but Rails controllers +providing a suitable response. Usually, this means returning HTML, but Rails controllers can also generate XML, JSON, PDFs, mobile-specific views, and more. Controllers load and manipulate models, and render view templates in order to generate the appropriate HTTP response. In Rails, incoming requests are routed by Action Dispatch to an appropriate controller, and @@ -37,7 +37,7 @@ are bundled together in [Action Pack](actionpack/README.rdoc). The _**View layer**_ is composed of "templates" that are responsible for providing appropriate representations of your application's resources. Templates can come in a variety of formats, but most view templates are HTML with embedded -Ruby code (ERB files). Views are typically rendered to generate a controller response, +Ruby code (ERB files). Views are typically rendered to generate a controller response or to generate the body of an email. In Rails, View generation is handled by [Action View](actionview/README.rdoc). ## Frameworks and libraries |