summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-19 02:27:25 +0000
committerzzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-19 02:27:25 +0000
commit826df7f233e8cff4842261807fbb1f77e520ce3a (patch)
tree3fc63ef88c586a74b7dae55263295428a4801607
parentb19a968f9ad54bc6a71bcb657271166931e59805 (diff)
* ext/psych/lib/psych*: [DOC] Capitalize "Ruby" in documentation
Patch by Dave Worth https://github.com/ruby/ruby/pull/341 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42054 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/psych/lib/psych.rb10
-rw-r--r--ext/psych/lib/psych/scalar_scanner.rb2
-rw-r--r--ext/psych/lib/psych/visitors/to_ruby.rb2
-rw-r--r--ext/psych/lib/psych/visitors/yaml_tree.rb2
5 files changed, 13 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index e5b86a30bd8..eb8846d67ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 19 11:26:28 2013 Zachary Scott <e@zzak.io>
+
+ * ext/psych/lib/psych*: [DOC] Capitalize "Ruby" in documentation
+ Patch by Dave Worth https://github.com/ruby/ruby/pull/341
+
Fri Jul 19 11:25:12 2013 Zachary Scott <e@zzak.io>
* lib/rdoc/*: [DOC] Capitalize "Ruby" in documentation
diff --git a/ext/psych/lib/psych.rb b/ext/psych/lib/psych.rb
index 711b3c1377d..c5db8f732f9 100644
--- a/ext/psych/lib/psych.rb
+++ b/ext/psych/lib/psych.rb
@@ -41,7 +41,7 @@ require 'psych/handlers/document_stream'
# Psych provides a range of interfaces for parsing a YAML document ranging from
# low level to high level, depending on your parsing needs. At the lowest
# level, is an event based parser. Mid level is access to the raw YAML AST,
-# and at the highest level is the ability to unmarshal YAML to ruby objects.
+# and at the highest level is the ability to unmarshal YAML to Ruby objects.
#
# == YAML Emitting
#
@@ -172,7 +172,7 @@ require 'psych/handlers/document_stream'
#
# The lowest level parser should be used when the YAML input is already known,
# and the developer does not want to pay the price of building an AST or
-# automatic detection and conversion to ruby objects. See Psych::Parser for
+# automatic detection and conversion to Ruby objects. See Psych::Parser for
# more information on using the event based parser.
#
# ==== Reading to Psych::Nodes::Stream structure
@@ -200,7 +200,7 @@ require 'psych/handlers/document_stream'
# document. This interface should be used when document format is known in
# advance or speed is a concern. See Psych::Emitter for more information.
#
-# ==== Writing to a ruby structure
+# ==== Writing to a Ruby structure
#
# Psych.parser.parse("--- a") # => #<Psych::Parser>
#
@@ -433,7 +433,7 @@ module Psych
###
# Load multiple documents given in +yaml+. Returns the parsed documents
- # as a list. If a block is given, each document will be converted to ruby
+ # as a list. If a block is given, each document will be converted to Ruby
# and passed to the block during parsing
#
# Example:
@@ -458,7 +458,7 @@ module Psych
###
# Load the document contained in +filename+. Returns the yaml contained in
- # +filename+ as a ruby object
+ # +filename+ as a Ruby object
def self.load_file filename
File.open(filename, 'r:bom|utf-8') { |f| self.load f, filename }
end
diff --git a/ext/psych/lib/psych/scalar_scanner.rb b/ext/psych/lib/psych/scalar_scanner.rb
index 5935e26b288..7a9bb87cbd9 100644
--- a/ext/psych/lib/psych/scalar_scanner.rb
+++ b/ext/psych/lib/psych/scalar_scanner.rb
@@ -28,7 +28,7 @@ module Psych
@class_loader = class_loader
end
- # Tokenize +string+ returning the ruby object
+ # Tokenize +string+ returning the Ruby object
def tokenize string
return nil if string.empty?
return string if @string_cache.key?(string)
diff --git a/ext/psych/lib/psych/visitors/to_ruby.rb b/ext/psych/lib/psych/visitors/to_ruby.rb
index f770bb80aa3..8695fd475e5 100644
--- a/ext/psych/lib/psych/visitors/to_ruby.rb
+++ b/ext/psych/lib/psych/visitors/to_ruby.rb
@@ -9,7 +9,7 @@ end
module Psych
module Visitors
###
- # This class walks a YAML AST, converting each node to ruby
+ # This class walks a YAML AST, converting each node to Ruby
class ToRuby < Psych::Visitors::Visitor
def self.create
class_loader = ClassLoader.new
diff --git a/ext/psych/lib/psych/visitors/yaml_tree.rb b/ext/psych/lib/psych/visitors/yaml_tree.rb
index 24cbe87f809..eb1f0d76a70 100644
--- a/ext/psych/lib/psych/visitors/yaml_tree.rb
+++ b/ext/psych/lib/psych/visitors/yaml_tree.rb
@@ -5,7 +5,7 @@ require 'psych/class_loader'
module Psych
module Visitors
###
- # YAMLTree builds a YAML ast given a ruby object. For example:
+ # YAMLTree builds a YAML ast given a Ruby object. For example:
#
# builder = Psych::Visitors::YAMLTree.new
# builder << { :foo => 'bar' }