aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorJonathan Roes <jroes@jroes.net>2013-04-18 23:09:10 -0300
committerJonathan Roes <jroes@jroes.net>2013-04-18 23:09:10 -0300
commit6e5b0f9d25d6a2bbdc92979484929cedc19867ea (patch)
treec565f8a4cfe3a62a538316ef3d3decaa66fb7ef7 /guides
parent48cd23570b42147de3cb54446e620c961d089f07 (diff)
downloadrails-6e5b0f9d25d6a2bbdc92979484929cedc19867ea.tar.gz
rails-6e5b0f9d25d6a2bbdc92979484929cedc19867ea.tar.bz2
rails-6e5b0f9d25d6a2bbdc92979484929cedc19867ea.zip
Grammar
Diffstat (limited to 'guides')
-rw-r--r--guides/source/initialization.md12
1 files changed, 6 insertions, 6 deletions
diff --git a/guides/source/initialization.md b/guides/source/initialization.md
index c71b0d5697..72d56b7feb 100644
--- a/guides/source/initialization.md
+++ b/guides/source/initialization.md
@@ -145,11 +145,11 @@ module Rails
### `actionpack/lib/action_dispatch.rb`
Action Dispatch is the routing component of the Rails framework.
-It adds functionalities like routing, session, and common middlewares.
+It adds functionality like routing, session, and common middlewares.
### `rails/commands/server.rb`
-The `Rails::Server` class is defined in this file as inheriting from `Rack::Server`. When `Rails::Server.new` is called, this calls the `initialize` method in `rails/commands/server.rb`:
+The `Rails::Server` class is defined in this file by inheriting from `Rack::Server`. When `Rails::Server.new` is called, this calls the `initialize` method in `rails/commands/server.rb`:
```ruby
def initialize(*)
@@ -439,14 +439,14 @@ inside each of those frameworks, but you're encouraged to try and
explore them on your own.
For now, just keep in mind that common functionality like Rails engines,
-I18n and Rails configuration is all being defined here.
+I18n and Rails configuration are all being defined here.
### Back to `config/environment.rb`
When `config/application.rb` has finished loading Rails, and defined
-your application namespace, you go back to `config/environment.rb`,
-where your application is initialized. For example, if you application was called
-`Blog`, here you would find `Blog::Application.initialize!`, which is
+the application namespace, we go back to `config/environment.rb`,
+where the application is initialized. For example, if the application was called
+`Blog`, here we would find `Blog::Application.initialize!`, which is
defined in `rails/application.rb`
### `railties/lib/rails/application.rb`