Merge branch 'master' of github.com:lifo/docrails

Author: vijaydev

railties/guides/source/active_record_validations_callbacks.textile

@@ -517,6 +517,18 @@ class Person < ActiveRecord::Base
 end
 </ruby>
 
+h3. Strict Validations
+
+You can also specify validations to be strict and raise +ActiveModel::StrictValidationFailed+ when the object is invalid.
+
+<ruby>
+class Person < ActiveRecord::Base
+  validates :name, :presence => { :strict => true }
+end
+
+Person.new.valid?  => ActiveModel::StrictValidationFailed: Name can't be blank
+</ruby>
+
 h3. Conditional Validation
 
 Sometimes it will make sense to validate an object just when a given predicate is satisfied. You can do that by using the +:if+ and +:unless+ options, which can take a symbol, a string or a +Proc+. You may use the +:if+ option when you want to specify when the validation *should* happen. If you want to specify when the validation *should not* happen, then you may use the +:unless+ option.

railties/guides/source/caching_with_rails.textile

@@ -359,7 +359,7 @@ h4. ActiveSupport::Cache::NullStore
 This cache store implementation is meant to be used only in development or test environments and it never stores anything. This can be very useful in development when you have code that interacts directly with +Rails.cache+, but caching may interfere with being able to see the results of code changes. With this cache store, all +fetch+ and +read+ operations will result in a miss.
 
 <ruby>
-ActionController::Base.cache_store = :null
+ActionController::Base.cache_store = :null_store
 </ruby>
 
 h4. Custom Cache Stores

railties/guides/source/layouts_and_rendering.textile

@@ -359,7 +359,7 @@ class ProductsController < ApplicationController
 end
 </ruby>
 
-With this declaration, all of the methods within +ProductsController+ will use +app/views/layouts/inventory.html.erb+ for their layout.
+With this declaration, all of the views rendered by the products controller will use +app/views/layouts/inventory.html.erb+ as their layout.
 
 To assign a specific layout for the entire application, use a +layout+ declaration in your +ApplicationController+ class:
 

railties/guides/source/routing.textile

@@ -301,6 +301,12 @@ If you wanted to link to just a magazine, you could leave out the +Array+:
 <%= link_to "Magazine details", @magazine %>
 </erb>
 
+For other actions, you just need to insert the action name as the first element of the +Array+:
+
+<erb>
+<%= link_to "Edit Ad", [:edit, @magazine, @ad] %>
+</erb>
+
 This allows you to treat instances of your models as URLs, and is a key advantage to using the resourceful style.
 
 h4. Adding More RESTful Actions