diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-04-14 01:00:03 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-04-14 01:00:03 -0700 |
| commit | 9a4fdff0af0ba05ad77096ce835aeb4bf343a53f (patch) | |
| tree | d4657c9e64fdc050695dd58cf419241ace32e7a6 /actionpack/lib/action_controller | |
| parent | 2ff5f38abb4a44ed5356c34b40d30d446fb63408 (diff) | |
| parent | e090898c5e98e853828208343b3911a229563b62 (diff) | |
| download | rails-9a4fdff0af0ba05ad77096ce835aeb4bf343a53f.tar.gz rails-9a4fdff0af0ba05ad77096ce835aeb4bf343a53f.tar.bz2 rails-9a4fdff0af0ba05ad77096ce835aeb4bf343a53f.zip | |
Merge commit 'docrails/master'
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/caching/pages.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/caching/pages.rb b/actionpack/lib/action_controller/caching/pages.rb index 2a0a1107eb..21a424e6f0 100644 --- a/actionpack/lib/action_controller/caching/pages.rb +++ b/actionpack/lib/action_controller/caching/pages.rb @@ -41,7 +41,7 @@ module ActionController #:nodoc: ## # :singleton-method: # The cache directory should be the document root for the web server and is set using <tt>Base.page_cache_directory = "/document/root"</tt>. - # For Rails, this directory has already been set to Rails.public_path (which is usually set to <tt>RAILS_ROOT + "/public"</tt>). Changing + # For Rails, this directory has already been set to Rails.public_path (which is usually set to <tt>Rails.root + "/public"</tt>). Changing # this setting can be useful to avoid naming conflicts with files in <tt>public/</tt>, but doing so will likely require configuring your # web server to look in the new location for cached files. @@page_cache_directory = '' |