diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/caching.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 055da8e7ef..780ba1135f 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Improve expire_fragment documentation. #2966 [court3nay@gmail.com] + * Correct docs for automatic layout assignment. #2610. [Charles M. Gerungan] * Always create new AR sessions rather than trying too hard to avoid database traffic. #2731 [Jeremy Kemper] diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index ef60d0a73e..56ab26f733 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -306,7 +306,8 @@ module ActionController #:nodoc: # Name can take one of three forms: # * String: This would normally take the form of a path like "pages/45/notes" # * Hash: Is treated as an implicit call to url_for, like { :controller => "pages", :action => "notes", :id => 45 } - # * Regexp: Will destroy all the matched fragments, example: %r{pages/\d*/notes} + # * Regexp: Will destroy all the matched fragments, example: %r{pages/\d*/notes} Ensure you don't use specify start and finish in your regex (^$) because the actual filename matched will look like ./cache/filename/path.cache + # def expire_fragment(name, options = nil) return unless perform_caching |