diff options
author | Xavier Noria <fxn@hashref.com> | 2010-07-13 18:41:09 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2010-07-13 18:41:09 +0200 |
commit | 6d2e4ee96c22502380dc94bebdead56133143b9e (patch) | |
tree | d25bddeda96903d0a6ec75ca087898875fa2981d /activesupport | |
parent | b75fca9e57423eec81384ff3e35f38fd4f7fe47f (diff) | |
parent | 7e075e62479a0eccad6eaf7a7c20f45347860c83 (diff) | |
download | rails-6d2e4ee96c22502380dc94bebdead56133143b9e.tar.gz rails-6d2e4ee96c22502380dc94bebdead56133143b9e.tar.bz2 rails-6d2e4ee96c22502380dc94bebdead56133143b9e.zip |
Merge remote branch 'docrails/master'
Diffstat (limited to 'activesupport')
-rw-r--r-- | activesupport/lib/active_support/values/time_zone.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb index 49dd8a1b99..abd585b64f 100644 --- a/activesupport/lib/active_support/values/time_zone.rb +++ b/activesupport/lib/active_support/values/time_zone.rb @@ -8,10 +8,10 @@ require 'active_support/core_ext/object/try' # * Lazily load TZInfo::Timezone instances only when they're needed. # * Create ActiveSupport::TimeWithZone instances via TimeZone's +local+, +parse+, +at+ and +now+ methods. # -# If you set <tt>config.time_zone</tt> in the Rails Initializer, you can access this TimeZone object via <tt>Time.zone</tt>: +# If you set <tt>config.time_zone</tt> in the Rails Application, you can access this TimeZone object via <tt>Time.zone</tt>: # -# # environment.rb: -# Rails::Initializer.run do |config| +# # application.rb: +# class Application < Rails::Application # config.time_zone = "Eastern Time (US & Canada)" # end # |