Skip to content

Commit dcf66b3

Browse files
authored
Merge pull request rails#41904 from jacobherrington/fix-grammar-mistakes-in-main-api-doc
2 parents 466a54f + 568dba6 commit dcf66b3

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

railties/RDOC_MAIN.rdoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ the {Active Model}[link:files/activemodel/README_rdoc.html] module.
2424
== Controller layer
2525

2626
The <em><b>Controller layer</b></em> is responsible for handling incoming HTTP requests and
27-
providing a suitable response. Usually this means returning \HTML, but \Rails controllers
27+
providing a suitable response. Usually, this means returning \HTML, but \Rails controllers
2828
can also generate XML, JSON, PDFs, mobile-specific views, and more. Controllers load and
29-
manipulate models, and render view templates in order to generate the appropriate HTTP response.
29+
manipulate models and render view templates in order to generate the appropriate HTTP response.
3030
In \Rails, incoming requests are routed by Action Dispatch to an appropriate controller, and
3131
controller classes are derived from <tt>ActionController::Base</tt>. Action Dispatch and Action Controller
3232
are bundled together in {Action Pack}[link:files/actionpack/README_rdoc.html].
@@ -72,7 +72,7 @@ and may also be used independently outside \Rails.
7272

7373
Run with <tt>--help</tt> or <tt>-h</tt> for options.
7474

75-
4. Go to <tt>http://localhost:3000</tt> and you'll see: "Yay! You’re on \Rails!"
75+
4. Go to <tt>http://localhost:3000</tt>, and you'll see: "Yay! You’re on \Rails!"
7676

7777
5. Follow the guidelines to start developing your application. You may find the following resources handy:
7878

railties/README.rdoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Railties is responsible for gluing all frameworks together. Overall, it:
88

99
* and provides the Rails generators core.
1010

11-
1211
== Download
1312

1413
The latest version of Railties can be installed with RubyGems:

0 commit comments

Comments
 (0)