diff options
author | Xavier Noria <fxn@hashref.com> | 2011-08-13 16:30:07 -0700 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2011-08-13 16:30:07 -0700 |
commit | bf2b9d2de3f85e880e5afa980e6fd65b1f07557c (patch) | |
tree | 41545ddaa2ab78f4f70bd847be99550c8c52b4f8 /actionpack/lib/action_controller/caching/actions.rb | |
parent | acfdb18d92c3ab6b80023b643f89f3ce3cab6840 (diff) | |
parent | f566fb32c49a81636ca341f376f99ef230d71d99 (diff) | |
download | rails-bf2b9d2de3f85e880e5afa980e6fd65b1f07557c.tar.gz rails-bf2b9d2de3f85e880e5afa980e6fd65b1f07557c.tar.bz2 rails-bf2b9d2de3f85e880e5afa980e6fd65b1f07557c.zip |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
RELEASING_RAILS.rdoc
actionpack/lib/sprockets/railtie.rb
actionpack/test/template/sprockets_helper_test.rb
activerecord/test/cases/calculations_test.rb
railties/guides/source/3_1_release_notes.textile
railties/guides/source/active_resource_basics.textile
railties/guides/source/command_line.textile
Diffstat (limited to 'actionpack/lib/action_controller/caching/actions.rb')
-rw-r--r-- | actionpack/lib/action_controller/caching/actions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/caching/actions.rb b/actionpack/lib/action_controller/caching/actions.rb index 667ba15cc9..0031d2701f 100644 --- a/actionpack/lib/action_controller/caching/actions.rb +++ b/actionpack/lib/action_controller/caching/actions.rb @@ -38,7 +38,7 @@ module ActionController #:nodoc: # <tt>:action => 'lists'</tt> is not the same as # <tt>:action => 'list', :format => :xml</tt>. # - # You can set modify the default action cache path by passing a + # You can modify the default action cache path by passing a # <tt>:cache_path</tt> option. This will be passed directly to # <tt>ActionCachePath.path_for</tt>. This is handy for actions with # multiple possible routes that should be cached differently. If a |