aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides/source/caching_with_rails.textile
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-08-31 00:24:05 +0200
committerXavier Noria <fxn@hashref.com>2010-08-31 00:24:05 +0200
commit3805d01c9b0ee6681d3e36233a82731200b87d34 (patch)
tree0c50c954f6561c64438dc14a7771f9ac4c320003 /railties/guides/source/caching_with_rails.textile
parentd37a65307d280e47eb5c15b61c0b20ac6cab6a84 (diff)
parentc30f6c270da5cd2ad7605ee9255f052e93609e30 (diff)
downloadrails-3805d01c9b0ee6681d3e36233a82731200b87d34.tar.gz
rails-3805d01c9b0ee6681d3e36233a82731200b87d34.tar.bz2
rails-3805d01c9b0ee6681d3e36233a82731200b87d34.zip
resolves merge conflict
Diffstat (limited to 'railties/guides/source/caching_with_rails.textile')
-rw-r--r--railties/guides/source/caching_with_rails.textile2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/guides/source/caching_with_rails.textile b/railties/guides/source/caching_with_rails.textile
index ff672d8695..818c6eb00e 100644
--- a/railties/guides/source/caching_with_rails.textile
+++ b/railties/guides/source/caching_with_rails.textile
@@ -364,7 +364,7 @@ end
h3. Advanced Caching
-Along with the built-in mechanisms outlined above, a number of excellent plugins exist to help with finer grained control over caching. These include Chris Wanstrath's excellent cache_fu plugin (more info "here": http://errtheblog.com/posts/57-kickin-ass-w-cachefu) and Evan Weaver's interlock plugin (more info "here": http://blog.evanweaver.com/articles/2007/12/13/better-rails-caching/). Both of these plugins play nice with memcached and are a must-see for anyone
+Along with the built-in mechanisms outlined above, a number of excellent plugins exist to help with finer grained control over caching. These include Chris Wanstrath's excellent cache_fu plugin (more info "here":http://errtheblog.com/posts/57-kickin-ass-w-cachefu ) and Evan Weaver's interlock plugin (more info "here":http://blog.evanweaver.com/articles/2007/12/13/better-rails-caching/ ). Both of these plugins play nice with memcached and are a must-see for anyone
seriously considering optimizing their caching needs.
Also the new "Cache money":http://github.com/nkallen/cache-money/tree/master plugin is supposed to be mad cool.