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

xuanxu · Dec 28, 2012 · 427544e · 427544e
2 parents 90397de + 896a049
commit 427544e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/guides/source/active_record_validations.md b/guides/source/active_record_validations.md
@@ -656,8 +656,6 @@ class Coffee < ActiveRecord::Base
 end
 ```
 
-TIP: `:allow_nil` is ignored by the presence validator.
-
 ### `:allow_blank`
 
 The `:allow_blank` option is similar to the `:allow_nil` option. This option
@@ -673,8 +671,6 @@ Topic.create("title" => "").valid?  # => true
 Topic.create("title" => nil).valid? # => true
 ```
 
-TIP: `:allow_blank` is ignored by the presence validator.
-
 ### `:message`
 
 As you've already seen, the `:message` option lets you specify the message that

diff --git a/guides/source/active_support_instrumentation.md b/guides/source/active_support_instrumentation.md
@@ -432,7 +432,7 @@ from block args like this:
 
 ```ruby
 ActiveSupport::Notifications.subscribe "process_action.action_controller" do |*args|
-  event = ActiveSupport::Notification::Event.new args
+  event = ActiveSupport::Notifications::Event.new *args
 
   event.name      # => "process_action.action_controller"
   event.duration  # => 10 (in milliseconds)