diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-02-01 22:25:52 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-02-01 22:25:52 +0530 |
| commit | d2c64009482d38d4894dd09d2d1e2fb4a165ecac (patch) | |
| tree | 42a4fa8d1b49d596c53b94ca21646f05418d3c67 /actionpack | |
| parent | de0043d794e8ba05a15d28db76e7deaf847183a2 (diff) | |
| parent | e1dbcdcacf62d13914c9e7ec71f0f7319ad32b4a (diff) | |
| download | rails-d2c64009482d38d4894dd09d2d1e2fb4a165ecac.tar.gz rails-d2c64009482d38d4894dd09d2d1e2fb4a165ecac.tar.bz2 rails-d2c64009482d38d4894dd09d2d1e2fb4a165ecac.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/caching/actions.rb | 3 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/routing.rb | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/caching/actions.rb b/actionpack/lib/action_controller/caching/actions.rb index e76a79f710..bd3b0b5df3 100644 --- a/actionpack/lib/action_controller/caching/actions.rb +++ b/actionpack/lib/action_controller/caching/actions.rb @@ -47,7 +47,8 @@ module ActionController #:nodoc: # And you can also use <tt>:if</tt> (or <tt>:unless</tt>) to pass a # proc that specifies when the action should be cached. # - # Finally, if you are using memcached, you can also pass <tt>:expires_in</tt>. + # As of Rails 3.0, you can also pass <tt>:expires_in</tt> with a time + # interval (in seconds) to schedule expiration of the cached item. # # The following example depicts some of the points made above: # diff --git a/actionpack/lib/action_dispatch/routing.rb b/actionpack/lib/action_dispatch/routing.rb index 2f6b9d266d..107fe80d1f 100644 --- a/actionpack/lib/action_dispatch/routing.rb +++ b/actionpack/lib/action_dispatch/routing.rb @@ -190,7 +190,7 @@ module ActionDispatch # Examples: # # match 'post/:id' => 'posts#show', :via => :get - # match 'post/:id' => "posts#create_comment', :via => :post + # match 'post/:id' => 'posts#create_comment', :via => :post # # Now, if you POST to <tt>/posts/:id</tt>, it will route to the <tt>create_comment</tt> action. A GET on the same # URL will route to the <tt>show</tt> action. @@ -203,7 +203,7 @@ module ActionDispatch # Examples: # # get 'post/:id' => 'posts#show' - # post 'post/:id' => "posts#create_comment' + # post 'post/:id' => 'posts#create_comment' # # This syntax is less verbose and the intention is more apparent to someone else reading your code, # however if your route needs to respond to more than one HTTP method (or all methods) then using the |