diff options
| author | Dallas Taylor <dallastaylor@gmail.com> | 2009-04-27 17:46:18 +0100 |
|---|---|---|
| committer | Dallas Taylor <dallastaylor@gmail.com> | 2009-04-27 17:46:18 +0100 |
| commit | 8e93e929a171907727f7e63f7669cf1c3141abdc (patch) | |
| tree | 1da22f7fcffe8db2db4d0341a9225d6b3ddc940d /railties | |
| parent | 9d9adc998d5d0abba39d1ac06254cabf8bc93d55 (diff) | |
| parent | de9ea3bf252799aea2b1b923f3153ec4d85226d1 (diff) | |
| download | rails-8e93e929a171907727f7e63f7669cf1c3141abdc.tar.gz rails-8e93e929a171907727f7e63f7669cf1c3141abdc.tar.bz2 rails-8e93e929a171907727f7e63f7669cf1c3141abdc.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/guides/source/caching_with_rails.textile | 9 | ||||
| -rw-r--r-- | railties/guides/source/i18n.textile | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/railties/guides/source/caching_with_rails.textile b/railties/guides/source/caching_with_rails.textile index f1ad7b820d..3b0c43d6ee 100644 --- a/railties/guides/source/caching_with_rails.textile +++ b/railties/guides/source/caching_with_rails.textile @@ -83,7 +83,7 @@ class ProductsController < ActionController end def create - expire_page :action => :index + expire_page :action => :list end end @@ -275,7 +275,7 @@ h4. SQL Caching Query caching is a Rails feature that caches the result set returned by each query so that if Rails encounters the same query again for that request, it -will used the cached result set as opposed to running the query against the +will use the cached result set as opposed to running the query against the database again. For example: @@ -481,7 +481,7 @@ class ProductsController < ApplicationController def show @product = Product.find(params[:id]) - fresh_when :last_modified => @product.published_at.utc, :etag => @article + fresh_when :last_modified => @product.published_at.utc, :etag => @product end end </ruby> @@ -501,7 +501,7 @@ h3. References * "Scaling Rails Screencasts":http://railslab.newrelic.com/scaling-rails * "RailsEnvy, Rails Caching Tutorial, Part 1":http://www.railsenvy.com/2007/2/28/rails-caching-tutorial -* "RailsEnvy, Rails Caching Tutorial, Part 1":http://www.railsenvy.com/2007/3/20/ruby-on-rails-caching-tutorial-part-2 +* "RailsEnvy, Rails Caching Tutorial, Part 2":http://www.railsenvy.com/2007/3/20/ruby-on-rails-caching-tutorial-part-2 * "ActiveSupport::Cache documentation":http://api.rubyonrails.org/classes/ActiveSupport/Cache.html * "Rails 2.1 integrated caching tutorial":http://thewebfellas.com/blog/2008/6/9/rails-2-1-now-with-better-integrated-caching @@ -509,6 +509,7 @@ h3. References h3. Changelog "Lighthouse ticket":http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/10-guide-to-caching +April 26, 2009: Clean up typos in submitted patch April 1, 2009: Made a bunch of small fixes February 22, 2009: Beefed up the section on cache_stores December 27, 2008: Typo fixes diff --git a/railties/guides/source/i18n.textile b/railties/guides/source/i18n.textile index c4f178faa0..aa5982af5d 100644 --- a/railties/guides/source/i18n.textile +++ b/railties/guides/source/i18n.textile @@ -686,7 +686,7 @@ en: # will translate User attribute "login" as "Handle" </ruby> -Then +User.human_name+ will return "Dude" and +User.human_attribute_name(:login)+ will return "Handle". +Then +User.human_name+ will return "Dude" and +User.human_attribute_name("login")+ will return "Handle". h5. Error Message Scopes |