diff options
| author | Xavier Noria <fxn@hashref.com> | 2008-05-21 23:20:28 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2008-05-21 23:39:07 +0200 |
| commit | 11f0fd5c6febed712194b0494b2e4de85b131c26 (patch) | |
| tree | 5cee80e2d14e21a7e7ba2e0562a6173d9782dbc6 | |
| parent | 1edbdbbfa8c516e687dcf43e37544ee72596540d (diff) | |
| download | rails-11f0fd5c6febed712194b0494b2e4de85b131c26.tar.gz rails-11f0fd5c6febed712194b0494b2e4de85b131c26.tar.bz2 rails-11f0fd5c6febed712194b0494b2e4de85b131c26.zip | |
gsub("ActionController", "Action Controller")
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/url_helper.rb | 2 | ||||
| -rw-r--r-- | railties/lib/initializer.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 7ab6e37503..dbc6801146 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -54,7 +54,7 @@ module ActionMailer #:nodoc: # # = Mailer views # - # Like ActionController, each mailer class has a corresponding view directory + # Like Action Controller, each mailer class has a corresponding view directory # in which each method of the class looks for a template with its name. # To define a template to be used with a mailing, create an <tt>.erb</tt> file with the same name as the method # in your mailer model. For example, in the mailer defined above, the template at diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb index 38c8d18cb0..4b12adf225 100644 --- a/actionpack/lib/action_view/helpers/url_helper.rb +++ b/actionpack/lib/action_view/helpers/url_helper.rb @@ -10,7 +10,7 @@ module ActionView include JavaScriptHelper # Returns the URL for the set of +options+ provided. This takes the - # same options as url_for in ActionController (see the + # same options as +url_for+ in Action Controller (see the # documentation for ActionController::Base#url_for). Note that by default # <tt>:only_path</tt> is <tt>true</tt> so you'll get the relative /controller/action # instead of the fully qualified URL like http://example.com/controller/action. diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index c767e1ff7d..150e76af77 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -380,7 +380,7 @@ module Rails ActionController::Base.view_paths = [configuration.view_path] if configuration.frameworks.include?(:action_controller) && ActionController::Base.view_paths.empty? end - # If ActionController is not one of the loaded frameworks (Configuration#frameworks) + # If Action Controller is not one of the loaded frameworks (Configuration#frameworks) # this does nothing. Otherwise, it loads the routing definitions and sets up # loading module used to lazily load controllers (Configuration#controller_paths). def initialize_routing |