aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan Bigg <radarlistener@gmail.com>2010-11-29 11:54:48 +1100
committerRyan Bigg <radarlistener@gmail.com>2010-11-29 11:54:48 +1100
commit0d32572275f066099e472f37ca2e6262e8c07bf5 (patch)
tree71fe8775c251d9220165205ae86af529df1874c7
parentb62d5d62e93ee0ad7b4500e4c351f98d9c685abd (diff)
downloadrails-0d32572275f066099e472f37ca2e6262e8c07bf5.tar.gz
rails-0d32572275f066099e472f37ca2e6262e8c07bf5.tar.bz2
rails-0d32572275f066099e472f37ca2e6262e8c07bf5.zip
Move threadsafe warning to threadsafe's new location in config guide
-rw-r--r--railties/guides/source/configuring.textile4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/guides/source/configuring.textile b/railties/guides/source/configuring.textile
index e206d1d16b..6272d81d7f 100644
--- a/railties/guides/source/configuring.textile
+++ b/railties/guides/source/configuring.textile
@@ -91,6 +91,8 @@ h4. Rails General Configuration
* +config.threadsafe!+ enables +allow_concurrency+, +cache_classes+, +dependency_loading+ and +preload_frameworks+ to make the application threadsafe.
+WARNING: Threadsafe operation is incompatible with the normal workings of development mode Rails. In particular, automatic dependency loading and class reloading are automatically disabled when you call +config.threadsafe!+.
+
* +config.time_zone+ sets the default time zone for the application and enables time zone awareness for Active Record.
* +config.whiny_nils+ enables or disabled warnings when an methods of nil are invoked. Defaults to _false_.
@@ -212,8 +214,6 @@ h4. Configuring Action Controller
* +config.action_controller.asset_path+ allows you to override the default asset path generation by providing your own instructions.
-WARNING: Threadsafe operation is incompatible with the normal workings of development mode Rails. In particular, automatic dependency loading and class reloading are automatically disabled when you call +config.threadsafe!+.
-
* +config.action_controller.default_charset+ specifies the default character set for all renders. The default is "utf-8".
* +config.action_controller.logger+ accepts a logger conforming to the interface of Log4r or the default Ruby 1.8+ Logger class, which is then used to log information from Action Controller. Set to nil to disable logging.