Merge branch 'master' into embed

* master: Update README.rdoc * lib/psych/deprecated.rb (load_documents): document deprecation
ruby · Nov 28, 2012 · e6bdf6f · e6bdf6f
2 parents 249f908 + b3609ae
commit e6bdf6f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/README.rdoc b/README.rdoc
@@ -24,7 +24,7 @@ to and from the YAML format.
 == Installation
 
 Psych has been included with MRI since 1.9.2,
-and is the fault YAML parser in 1.9.3.
+and is the default YAML parser in 1.9.3.
 
 If you want a newer gem release of Psych, you can use rubygems:
 

diff --git a/lib/psych/deprecated.rb b/lib/psych/deprecated.rb
@@ -21,6 +21,7 @@ def self.quick_emit thing, opts = {}, &block # :nodoc:
     target.psych_to_yaml unless opts[:nodump]
   end
 
+  # This method is deprecated, use Psych.load_stream instead.
   def self.load_documents yaml, &block
     if $VERBOSE
       warn "#{caller[0]}: load_documents is deprecated, use load_stream"