diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-01-08 16:53:20 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-01-08 16:53:20 -0800 |
| commit | bfd62dc4dd23211024b46ab7d29ecec7a407e168 (patch) | |
| tree | 47df4c75c7ee80025c2873e8ec6846a06e8a26d0 | |
| parent | 239aa1ae07bc20212106cf81054ed7c26f4b6f85 (diff) | |
| download | psych-bfd62dc4dd23211024b46ab7d29ecec7a407e168.tar.gz | |
merging ruby trunk
| -rw-r--r-- | lib/psych.rb | 2 | ||||
| -rw-r--r-- | lib/psych/nodes/sequence.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/psych.rb b/lib/psych.rb index 45e01c5..47802a4 100644 --- a/lib/psych.rb +++ b/lib/psych.rb @@ -136,7 +136,7 @@ require 'psych/class_loader' # ==== Exception handling # # begin -# # The second argument chnages only the exception contents +# # The second argument changes only the exception contents # Psych.parse("--- `", "file.txt") # rescue Psych::SyntaxError => ex # ex.file # => 'file.txt' diff --git a/lib/psych/nodes/sequence.rb b/lib/psych/nodes/sequence.rb index e4b833d..7e907fe 100644 --- a/lib/psych/nodes/sequence.rb +++ b/lib/psych/nodes/sequence.rb @@ -56,7 +56,7 @@ module Psych # Is this sequence started implicitly? attr_accessor :implicit - # The sequece style used + # The sequence style used attr_accessor :style ### |