Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into embed

* master:
  Update README.rdoc
  * lib/psych/deprecated.rb (load_documents): document deprecation
  • Loading branch information...
commit e6bdf6f781d6e3e65d16432eb63f2463ac6c7adb 2 parents 249f908 + b3609ae
@tenderlove authored
Showing with 2 additions and 1 deletion.
  1. +1 −1  README.rdoc
  2. +1 −0  lib/psych/deprecated.rb
View
2  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:
View
1  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"
Please sign in to comment.
Something went wrong with that request. Please try again.