diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2013-12-20 00:10:30 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2013-12-20 00:10:30 +0530 |
| commit | a3b1105ada3da64acfa3843b164b14b734456a50 (patch) | |
| tree | b3af8434bf411419bb0bc51aaac306ffe1451b95 /activesupport/lib/active_support/values | |
| parent | 3968870d31dc5ab272b5e77904c45183227696be (diff) | |
| parent | 4dd8b0b5484289eaa30975dbd45bf7112f43a64a (diff) | |
| download | rails-a3b1105ada3da64acfa3843b164b14b734456a50.tar.gz rails-a3b1105ada3da64acfa3843b164b14b734456a50.tar.bz2 rails-a3b1105ada3da64acfa3843b164b14b734456a50.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activesupport/lib/active_support/values')
| -rw-r--r-- | activesupport/lib/active_support/values/time_zone.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb index a22e61d286..3862ab5c42 100644 --- a/activesupport/lib/active_support/values/time_zone.rb +++ b/activesupport/lib/active_support/values/time_zone.rb @@ -359,14 +359,14 @@ module ActiveSupport class << self alias_method :create, :new - # Return a TimeZone instance with the given name, or +nil+ if no + # Returns a TimeZone instance with the given name, or +nil+ if no # such TimeZone instance exists. (This exists to support the use of # this class with the +composed_of+ macro.) def new(name) self[name] end - # Return an array of all TimeZone objects. There are multiple + # Returns an array of all TimeZone objects. There are multiple # TimeZone objects per time zone, in many cases, to make it easier # for users to find their own time zone. def all |