aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikel Lindsaar <raasdnil@gmail.com>2010-02-08 15:08:10 +1100
committerMikel Lindsaar <raasdnil@gmail.com>2010-02-08 15:08:10 +1100
commitde0753d2ae351db834d8d476caeceafb044fa6f9 (patch)
tree7893dff8532102e6ada495302482c11deebd153d
parentb9e5263625a3e4f26c4bda3394f7425e148a0a6e (diff)
downloadrails-de0753d2ae351db834d8d476caeceafb044fa6f9.tar.gz
rails-de0753d2ae351db834d8d476caeceafb044fa6f9.tar.bz2
rails-de0753d2ae351db834d8d476caeceafb044fa6f9.zip
Editing the railties/../railtie.rb and engine.rb docs
-rw-r--r--railties/lib/rails/engine.rb7
-rw-r--r--railties/lib/rails/railtie.rb9
2 files changed, 7 insertions, 9 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 096bb9b934..2b9c4add4f 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -3,9 +3,8 @@ require 'rails/railtie'
module Rails
# Rails::Engine allows you to wrap a specific Rails application and share it accross
- # different applications. Since Rails 3.0, your Rails::Application is nothing
- # more than an Engine, thus your engines will behave much more closer to an application
- # since then.
+ # different applications. Since Rails 3.0, every Rails::Application is nothing
+ # more than an Engine, allowing you to share it very easily.
#
# Any Rails::Engine is also a Rails::Railtie, so the same methods (like rake_tasks and
# generators) and configuration available in the latter can also be used in the former.
@@ -47,7 +46,7 @@ module Rails
#
# == Paths
#
- # Since Rails 3.0, both your Application and Engines does not have hardcoded paths.
+ # Since Rails 3.0, both your Application and Engines do not have hardcoded paths.
# This means that you are not required to place your controllers at "app/controllers",
# but in any place which you find convenient.
#
diff --git a/railties/lib/rails/railtie.rb b/railties/lib/rails/railtie.rb
index 7bb932031c..b817f6b71e 100644
--- a/railties/lib/rails/railtie.rb
+++ b/railties/lib/rails/railtie.rb
@@ -8,12 +8,11 @@ module Rails
# Every major component of Rails (Action Mailer, Action Controller,
# Action View, Active Record and Active Resource) are all Railties, so each of
# them is responsible to set their own initialization. This makes, for example,
- # Rails absent of any ActiveRecord hook, allowing any other ORM to hook in.
+ # Rails absent of any ActiveRecord hook, allowing any other ORM framework to hook in.
#
- # Developing a Rails extension does not _require_ any implementation of
- # Railtie, but if you need to interact with the Rails framework
- # during boot, or after boot, then Railtie is what you need to do that
- # interaction.
+ # Developing a Rails extension does _not_ require any implementation of
+ # Railtie, but if you need to interact with the Rails framework during
+ # or after boot, then Railtie is what you need to do that interaction.
#
# For example, the following would need you to implement Railtie in your
# plugin: