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

Conflicts:
	actionpack/lib/action_dispatch/routing/redirection.rb

1 files changed, 4 insertions, 4 deletions

diff --git a/guides/source/active_model_basics.md b/guides/source/active_model_basics.md
index bfb088ed03..92b51334a3 100644
--- a/guides/source/active_model_basics.md
+++ b/guides/source/active_model_basics.md
@@ -188,13 +188,13 @@ class Person
 
   attr_accessor :name, :email, :token
   
-  validates :name, :presence => true
-  validates_format_of :email, :with => /\A([^\s]+)((?:[-a-z0-9]\.)[a-z]{2,})\z/i  
-  validates! :token, :presence => true
+  validates :name, presence: true
+  validates_format_of :email, with: /\A([^\s]+)((?:[-a-z0-9]\.)[a-z]{2,})\z/i  
+  validates! :token, presence: true
   
 end
 
-person = Person.new(:token => "2b1f325")
+person = Person.new(token: "2b1f325")
 person.valid?                        #=> false
 person.name  = 'vishnu'
 person.email  = 'me'