aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2008-05-21 22:58:10 +0200
committerXavier Noria <fxn@hashref.com>2008-05-21 23:39:07 +0200
commit1edbdbbfa8c516e687dcf43e37544ee72596540d (patch)
tree5716511134c73caa845bc677bc3738d7ad5e6800
parent981bb9bcccf744bd1515b716865b645dd5110948 (diff)
downloadrails-1edbdbbfa8c516e687dcf43e37544ee72596540d.tar.gz
rails-1edbdbbfa8c516e687dcf43e37544ee72596540d.tar.bz2
rails-1edbdbbfa8c516e687dcf43e37544ee72596540d.zip
gsub("ActiveSupport", "Active Support")
-rw-r--r--activeresource/lib/active_resource/base.rb2
-rw-r--r--activesupport/lib/active_support/core_ext/object/misc.rb2
-rw-r--r--activesupport/lib/active_support/json.rb2
-rw-r--r--activesupport/lib/active_support/values/time_zone.rb2
-rw-r--r--railties/lib/initializer.rb14
5 files changed, 11 insertions, 11 deletions
diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb
index 08fd0123f6..961f5e6f7f 100644
--- a/activeresource/lib/active_resource/base.rb
+++ b/activeresource/lib/active_resource/base.rb
@@ -820,7 +820,7 @@ module ActiveResource
# ==== Options
# The +options+ parameter is handed off to the +to_xml+ method on each
# attribute, so it has the same options as the +to_xml+ methods in
- # ActiveSupport.
+ # Active Support.
#
# * <tt>:indent</tt> - Set the indent level for the XML output (default is +2+).
# * <tt>:dasherize</tt> - Boolean option to determine whether or not element names should
diff --git a/activesupport/lib/active_support/core_ext/object/misc.rb b/activesupport/lib/active_support/core_ext/object/misc.rb
index a3637d7a8a..8384a12327 100644
--- a/activesupport/lib/active_support/core_ext/object/misc.rb
+++ b/activesupport/lib/active_support/core_ext/object/misc.rb
@@ -48,7 +48,7 @@ class Object
yield ActiveSupport::OptionMerger.new(self, options)
end
- # A duck-type assistant method. For example, ActiveSupport extends Date
+ # A duck-type assistant method. For example, Active Support extends Date
# to define an acts_like_date? method, and extends Time to define
# acts_like_time?. As a result, we can do "x.acts_like?(:time)" and
# "x.acts_like?(:date)" to do duck-type-safe comparisons, since classes that
diff --git a/activesupport/lib/active_support/json.rb b/activesupport/lib/active_support/json.rb
index bbda2c9fa3..54a7becd0f 100644
--- a/activesupport/lib/active_support/json.rb
+++ b/activesupport/lib/active_support/json.rb
@@ -1,5 +1,5 @@
module ActiveSupport
- # If true, use ISO 8601 format for dates and times. Otherwise, fall back to the ActiveSupport legacy format.
+ # If true, use ISO 8601 format for dates and times. Otherwise, fall back to the Active Support legacy format.
mattr_accessor :use_standard_json_time_format
class << self
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb
index 5007e1b204..4d7239d8cf 100644
--- a/activesupport/lib/active_support/values/time_zone.rb
+++ b/activesupport/lib/active_support/values/time_zone.rb
@@ -16,7 +16,7 @@
# Time.zone.name # => "Eastern Time (US & Canada)"
# Time.zone.now # => Sun, 18 May 2008 14:30:44 EDT -04:00
#
-# The version of TZInfo bundled with ActiveSupport only includes the definitions necessary to support the zones
+# The version of TZInfo bundled with Active Support only includes the definitions necessary to support the zones
# defined by the TimeZone class. If you need to use zones that aren't defined by TimeZone, you'll need to install the TZInfo gem
# (if a recent version of the gem is installed locally, this will be used instead of the bundled version.)
class TimeZone
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index 2deccd1078..c767e1ff7d 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -475,22 +475,22 @@ module Rails
# The application's base directory.
attr_reader :root_path
- # A stub for setting options on ActionController::Base
+ # A stub for setting options on ActionController::Base.
attr_accessor :action_controller
- # A stub for setting options on ActionMailer::Base
+ # A stub for setting options on ActionMailer::Base.
attr_accessor :action_mailer
- # A stub for setting options on ActionView::Base
+ # A stub for setting options on ActionView::Base.
attr_accessor :action_view
- # A stub for setting options on ActiveRecord::Base
+ # A stub for setting options on ActiveRecord::Base.
attr_accessor :active_record
- # A stub for setting options on ActiveRecord::Base
+ # A stub for setting options on ActiveRecord::Base.
attr_accessor :active_resource
- # A stub for setting options on ActiveSupport
+ # A stub for setting options on ActiveSupport.
attr_accessor :active_support
# Whether or not classes should be cached (set to false if you want
@@ -843,7 +843,7 @@ end
# Needs to be duplicated from Active Support since its needed before Active
# Support is available. Here both Options and Hash are namespaced to prevent
-# conflicts with other implementations AND with the classes residing in ActiveSupport.
+# conflicts with other implementations AND with the classes residing in Active Support.
class Rails::OrderedOptions < Array #:nodoc:
def []=(key, value)
key = key.to_sym