aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2012-09-09 17:38:47 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2012-09-09 17:38:47 +0530
commitcb524dc1d7525a26ecea8cf049757e530f0d4026 (patch)
tree3a2d8727e97c67e37a357c1cf180e9ca17cff28b /actionpack/lib/action_controller
parent6107407e66aa68cf269ec00b64d7ab3623465b97 (diff)
parent2db79dc9ea0b623c6d76b72e85f58efd63b50e08 (diff)
downloadrails-cb524dc1d7525a26ecea8cf049757e530f0d4026.tar.gz
rails-cb524dc1d7525a26ecea8cf049757e530f0d4026.tar.bz2
rails-cb524dc1d7525a26ecea8cf049757e530f0d4026.zip
Merge branch 'master' of github.com:lifo/docrails
Conflicts: activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/caching/sweeping.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/caching/sweeping.rb b/actionpack/lib/action_controller/caching/sweeping.rb
index 73291ce083..271d5f06b8 100644
--- a/actionpack/lib/action_controller/caching/sweeping.rb
+++ b/actionpack/lib/action_controller/caching/sweeping.rb
@@ -1,6 +1,6 @@
module ActionController #:nodoc:
module Caching
- # Sweepers are the terminators of the caching world and responsible for expiring caches when model objects change.
+ # Sweepers are the terminators of the caching world and responsible for expiring caches when Active Record objects change.
# They do this by being half-observers, half-filters and implementing callbacks for both roles. A Sweeper example:
#
# class ListSweeper < ActionController::Caching::Sweeper