diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-11-27 16:49:19 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-11-27 16:49:19 -0800 |
| commit | e6bdf6f781d6e3e65d16432eb63f2463ac6c7adb (patch) | |
| tree | 6db3581665410000ed0a982fec406ac42e98bcec | |
| parent | 249f9080826509deb39283a39e2fc4512e1316c3 (diff) | |
| parent | b3609ae8edeea80c0eda4d406011f740fb639cf2 (diff) | |
| download | psych-e6bdf6f781d6e3e65d16432eb63f2463ac6c7adb.tar.gz | |
Merge branch 'master' into embed
* master:
Update README.rdoc
* lib/psych/deprecated.rb (load_documents): document deprecation
| -rw-r--r-- | README.rdoc | 2 | ||||
| -rw-r--r-- | lib/psych/deprecated.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/README.rdoc b/README.rdoc index 93ba51d..91dc542 100644 --- 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 index 333c3a1..1e42859 100644 --- a/lib/psych/deprecated.rb +++ b/lib/psych/deprecated.rb @@ -21,6 +21,7 @@ module Psych 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" |