aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2014-03-06 11:45:04 +0100
committerYves Senn <yves.senn@gmail.com>2014-03-06 11:45:04 +0100
commit2e048bc007e9e0d25d2d243fedc1eb4b93a9428e (patch)
tree459ec7715c598d70075e7894a712fdd0e5aeac9e
parent9f84c7bc48dbcea3314943469358badc77b570b4 (diff)
parent64816dacc5ecbc9d26aed4869e6b9ffb8a02f14f (diff)
downloadrails-2e048bc007e9e0d25d2d243fedc1eb4b93a9428e.tar.gz
rails-2e048bc007e9e0d25d2d243fedc1eb4b93a9428e.tar.bz2
rails-2e048bc007e9e0d25d2d243fedc1eb4b93a9428e.zip
Merge pull request #14296 from joker1007/fix_rails_guides_about_active_record_default_timezone
Fix guide about `config.active_record.default_timezone` [ci skip]
-rw-r--r--guides/source/configuring.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/configuring.md b/guides/source/configuring.md
index 443135ed5f..eb04007016 100644
--- a/guides/source/configuring.md
+++ b/guides/source/configuring.md
@@ -274,7 +274,7 @@ All these configuration options are delegated to the `I18n` library.
* `config.active_record.pluralize_table_names` specifies whether Rails will look for singular or plural table names in the database. If set to true (the default), then the Customer class will use the `customers` table. If set to false, then the Customer class will use the `customer` table.
-* `config.active_record.default_timezone` determines whether to use `Time.local` (if set to `:local`) or `Time.utc` (if set to `:utc`) when pulling dates and times from the database. The default is `:utc` for Rails, although Active Record defaults to `:local` when used outside of Rails.
+* `config.active_record.default_timezone` determines whether to use `Time.local` (if set to `:local`) or `Time.utc` (if set to `:utc`) when pulling dates and times from the database. The default is `:utc`.
* `config.active_record.schema_format` controls the format for dumping the database schema to a file. The options are `:ruby` (the default) for a database-independent version that depends on migrations, or `:sql` for a set of (potentially database-dependent) SQL statements.