summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-18 13:50:32 +0000
committerzzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-18 13:50:32 +0000
commitc366a99cc539d9a963cbaac8040e988699609026 (patch)
tree35ba1d33bd451a5cb48ddb7f3da88855d1ac724b
parent2314c1bf476dbef2bd5904d262410dff230e1661 (diff)
* lib/cgi.rb: [DOC] Capitalize "Ruby" in documentation [Fixes GH-341]
Patch by Dave Worth https://github.com/ruby/ruby/pull/341 * lib/webrick.rb: ditto * lib/scanf.rb: ditto * lib/xmlrpc/config.rb: ditto * lib/resolv.rb: ditto * lib/e2mmap.rb: ditto * lib/fileutils.rb: ditto * lib/mkmf.rb: ditto * lib/cgi/session.rb: ditto * lib/yaml.rb: ditto * lib/erb.rb: ditto * lib/irb.rb: ditto * lib/tracer.rb: ditto * lib/net/http.rb: ditto * ext/syslog/lib/syslog/logger.rb: ditto * sample/pty/expect_sample.rb: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42045 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog20
-rw-r--r--ext/syslog/lib/syslog/logger.rb4
-rw-r--r--lib/cgi.rb2
-rw-r--r--lib/cgi/session.rb4
-rw-r--r--lib/e2mmap.rb2
-rw-r--r--lib/erb.rb4
-rw-r--r--lib/fileutils.rb2
-rw-r--r--lib/irb.rb8
-rw-r--r--lib/mkmf.rb10
-rw-r--r--lib/net/http.rb6
-rw-r--r--lib/resolv.rb2
-rw-r--r--lib/scanf.rb2
-rw-r--r--lib/tracer.rb2
-rw-r--r--lib/webrick.rb2
-rw-r--r--lib/xmlrpc/config.rb2
-rw-r--r--lib/yaml.rb2
-rw-r--r--sample/pty/expect_sample.rb2
17 files changed, 48 insertions, 28 deletions
diff --git a/ChangeLog b/ChangeLog
index ac6f454..17d42f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+Thu Jul 18 22:46:42 2013 Zachary Scott <e@zzak.io>
+
+ * lib/cgi.rb: [DOC] Capitalize "Ruby" in documentation [Fixes GH-341]
+ Patch by Dave Worth https://github.com/ruby/ruby/pull/341
+ * lib/webrick.rb: ditto
+ * lib/scanf.rb: ditto
+ * lib/xmlrpc/config.rb: ditto
+ * lib/resolv.rb: ditto
+ * lib/e2mmap.rb: ditto
+ * lib/fileutils.rb: ditto
+ * lib/mkmf.rb: ditto
+ * lib/cgi/session.rb: ditto
+ * lib/yaml.rb: ditto
+ * lib/erb.rb: ditto
+ * lib/irb.rb: ditto
+ * lib/tracer.rb: ditto
+ * lib/net/http.rb: ditto
+ * ext/syslog/lib/syslog/logger.rb: ditto
+ * sample/pty/expect_sample.rb: ditto
+
Thu Jul 18 21:30:50 2013 Tanaka Akira <akr@fsij.org>
* bignum.c (bary_sq_fast): Specialize the last iteration of the
diff --git a/ext/syslog/lib/syslog/logger.rb b/ext/syslog/lib/syslog/logger.rb
index a8d089a..1e1f9fe 100644
--- a/ext/syslog/lib/syslog/logger.rb
+++ b/ext/syslog/lib/syslog/logger.rb
@@ -63,9 +63,9 @@ class Syslog::Logger
##
# Maps Logger warning types to syslog(3) warning types.
#
- # Messages from ruby applications are not considered as critical as messages
+ # Messages from Ruby applications are not considered as critical as messages
# from other system daemons using syslog(3), so most messages are reduced by
- # one level. For example, a fatal message for ruby's Logger is considered
+ # one level. For example, a fatal message for Ruby's Logger is considered
# an error for syslog(3).
LEVEL_MAP = {
diff --git a/lib/cgi.rb b/lib/cgi.rb
index 9ecf734..15676ea 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -164,7 +164,7 @@ raise "Please, use ruby 1.9.0 or later." if RUBY_VERSION < "1.9.0"
# cgi.include?('field_name')
#
# CAUTION! cgi['field_name'] returned an Array with the old
-# cgi.rb(included in ruby 1.6)
+# cgi.rb(included in Ruby 1.6)
#
# === Get form values as hash
#
diff --git a/lib/cgi/session.rb b/lib/cgi/session.rb
index 3b624d8..606d5bc 100644
--- a/lib/cgi/session.rb
+++ b/lib/cgi/session.rb
@@ -62,7 +62,7 @@ class CGI
# works with String data. This is the default
# storage type.
# CGI::Session::MemoryStore:: stores data in an in-memory hash. The data
- # only persists for as long as the current ruby
+ # only persists for as long as the current Ruby
# interpreter instance does.
# CGI::Session::PStore:: stores data in Marshalled format. Provided by
# cgi/session/pstore.rb. Supports data of any type,
@@ -444,7 +444,7 @@ class CGI
# In-memory session storage class.
#
# Implements session storage as a global in-memory hash. Session
- # data will only persist for as long as the ruby interpreter
+ # data will only persist for as long as the Ruby interpreter
# instance does.
class MemoryStore
GLOBAL_HASH_TABLE = {} #:nodoc:
diff --git a/lib/e2mmap.rb b/lib/e2mmap.rb
index a477d14..82db365 100644
--- a/lib/e2mmap.rb
+++ b/lib/e2mmap.rb
@@ -1,6 +1,6 @@
#
#--
-# e2mmap.rb - for ruby 1.1
+# e2mmap.rb - for Ruby 1.1
# $Release Version: 2.0$
# $Revision: 1.10 $
# by Keiju ISHITSUKA
diff --git a/lib/erb.rb b/lib/erb.rb
index a8999d9..5c89cb4 100644
--- a/lib/erb.rb
+++ b/lib/erb.rb
@@ -63,7 +63,7 @@ require "cgi/util"
#
# == Character encodings
#
-# ERB (or ruby code generated by ERB) returns a string in the same
+# ERB (or Ruby code generated by ERB) returns a string in the same
# character encoding as the input string. When the input string has
# a magic comment, however, it returns a string in the encoding specified
# by the magic comment.
@@ -859,7 +859,7 @@ class ERB
end
private :new_toplevel
- # Define _methodname_ as instance method of _mod_ from compiled ruby source.
+ # Define _methodname_ as instance method of _mod_ from compiled Ruby source.
#
# example:
# filename = 'example.rhtml' # 'arg1' and 'arg2' are used in example.rhtml
diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index cc987bf..26129c4 100644
--- a/lib/fileutils.rb
+++ b/lib/fileutils.rb
@@ -417,7 +417,7 @@ module FileUtils
#
# +src+ can be a list of files.
#
- # # Installing ruby library "mylib" under the site_ruby
+ # # Installing Ruby library "mylib" under the site_ruby
# FileUtils.rm_r site_ruby + '/mylib', :force
# FileUtils.cp_r 'lib/', site_ruby + '/mylib'
#
diff --git a/lib/irb.rb b/lib/irb.rb
index 3f54849..20390d2 100644
--- a/lib/irb.rb
+++ b/lib/irb.rb
@@ -21,16 +21,16 @@ require "irb/locale"
STDOUT.sync = true
-# IRB stands for "interactive ruby" and is a tool to interactively execute ruby
+# IRB stands for "interactive Ruby" and is a tool to interactively execute Ruby
# expressions read from the standard input.
#
# The +irb+ command from your shell will start the interpreter.
#
# == Usage
#
-# Use of irb is easy if you know ruby.
+# Use of irb is easy if you know Ruby.
#
-# When executing irb, prompts are displayed as follows. Then, enter the ruby
+# When executing irb, prompts are displayed as follows. Then, enter the Ruby
# expression. An input is executed when it is syntactically complete.
#
# $ irb
@@ -221,7 +221,7 @@ STDOUT.sync = true
# == Restrictions
#
# Because irb evaluates input immediately after it is syntactically complete,
-# the results may be slightly different than directly using ruby.
+# the results may be slightly different than directly using Ruby.
#
# == IRB Sessions
#
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 27892b3..0e78d74 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -41,8 +41,8 @@ end
# :startdoc:
##
-# mkmf.rb is used by ruby C extensions to generate a Makefile which will
-# correctly compile and link the C extension to ruby and a third-party
+# mkmf.rb is used by Ruby C extensions to generate a Makefile which will
+# correctly compile and link the C extension to Ruby and a third-party
# library.
module MakeMakefile
#### defer until this module become global-state free.
@@ -57,7 +57,7 @@ module MakeMakefile
# end
##
- # The makefile configuration using the defaults from when ruby was built.
+ # The makefile configuration using the defaults from when Ruby was built.
CONFIG = RbConfig::MAKEFILE_CONFIG
ORIG_LIBPATH = ENV['LIB']
@@ -2527,12 +2527,12 @@ MESSAGE
end
##
- # Common headers for ruby C extensions
+ # Common headers for Ruby C extensions
COMMON_HEADERS = hdr.join("\n")
##
- # Common libraries for ruby C extensions
+ # Common libraries for Ruby C extensions
COMMON_LIBS = config_string('COMMON_LIBS', &split) || []
diff --git a/lib/net/http.rb b/lib/net/http.rb
index 5d17ae2..a383ff6 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -266,7 +266,7 @@ module Net #:nodoc:
# response = http.request request # Net::HTTPResponse object
# end
#
- # In previous versions of ruby you would need to require 'net/https' to use
+ # In previous versions of Ruby you would need to require 'net/https' to use
# HTTPS. This is no longer true.
#
# === Proxies
@@ -395,8 +395,8 @@ module Net #:nodoc:
end
# :startdoc:
- # Turns on net/http 1.2 (ruby 1.8) features.
- # Defaults to ON in ruby 1.8 or later.
+ # Turns on net/http 1.2 (Ruby 1.8) features.
+ # Defaults to ON in Ruby 1.8 or later.
def HTTP.version_1_2
true
end
diff --git a/lib/resolv.rb b/lib/resolv.rb
index 04b85ea..7d04731 100644
--- a/lib/resolv.rb
+++ b/lib/resolv.rb
@@ -9,7 +9,7 @@ rescue LoadError
end
# Resolv is a thread-aware DNS resolver library written in Ruby. Resolv can
-# handle multiple DNS requests concurrently without blocking the entire ruby
+# handle multiple DNS requests concurrently without blocking the entire Ruby
# interpreter.
#
# See also resolv-replace.rb to replace the libc resolver with Resolv.
diff --git a/lib/scanf.rb b/lib/scanf.rb
index cd1596b..199eb16 100644
--- a/lib/scanf.rb
+++ b/lib/scanf.rb
@@ -10,7 +10,7 @@
# == Description
#
# scanf is an implementation of the C function scanf(3), modified as necessary
-# for ruby compatibility.
+# for Ruby compatibility.
#
# the methods provided are String#scanf, IO#scanf, and
# Kernel#scanf. Kernel#scanf is a wrapper around STDIN.scanf. IO#scanf
diff --git a/lib/tracer.rb b/lib/tracer.rb
index 4dd2aaf..1d6b019 100644
--- a/lib/tracer.rb
+++ b/lib/tracer.rb
@@ -12,7 +12,7 @@ require "thread"
#
# == Example
#
-# Consider the following ruby script
+# Consider the following Ruby script
#
# class A
# def square(a)
diff --git a/lib/webrick.rb b/lib/webrick.rb
index be6d314..765efcb 100644
--- a/lib/webrick.rb
+++ b/lib/webrick.rb
@@ -8,7 +8,7 @@
#
# A WEBrick server can be composed of multiple WEBrick servers or servlets to
# provide differing behavior on a per-host or per-path basis. WEBrick
-# includes servlets for handling CGI scripts, ERb pages, ruby blocks and
+# includes servlets for handling CGI scripts, ERb pages, Ruby blocks and
# directory listings.
#
# WEBrick also includes tools for daemonizing a process and starting a process
diff --git a/lib/xmlrpc/config.rb b/lib/xmlrpc/config.rb
index 0213bef..9808147 100644
--- a/lib/xmlrpc/config.rb
+++ b/lib/xmlrpc/config.rb
@@ -27,7 +27,7 @@ module XMLRPC # :nodoc:
# allows integers greater than 32-bit if +true+
ENABLE_BIGINT = false
- # enable marshalling ruby objects which include XMLRPC::Marshallable
+ # enable marshalling Ruby objects which include XMLRPC::Marshallable
ENABLE_MARSHALLING = true
# enable multiCall extension by default
diff --git a/lib/yaml.rb b/lib/yaml.rb
index 6f60f9d..2d411f2 100644
--- a/lib/yaml.rb
+++ b/lib/yaml.rb
@@ -1,5 +1,5 @@
##
-# The YAML module is an alias of Psych, the YAML engine for ruby.
+# The YAML module is an alias of Psych, the YAML engine for Ruby.
begin
require 'psych'
diff --git a/sample/pty/expect_sample.rb b/sample/pty/expect_sample.rb
index d3b072b..2f87f21 100644
--- a/sample/pty/expect_sample.rb
+++ b/sample/pty/expect_sample.rb
@@ -3,7 +3,7 @@
#
# by A. Ito
#
-# This program reports the latest version of ruby interpreter
+# This program reports the latest version of Ruby interpreter
# by connecting to ftp server at ruby-lang.org.
#
require 'pty'