aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ext/fcntl/fcntl.c2
-rw-r--r--ext/socket/lib/socket.rb2
-rw-r--r--ext/win32/lib/win32/sspi.rb2
-rw-r--r--lib/net/http/header.rb4
-rw-r--r--lib/racc/rdoc/grammar.en.rdoc2
-rw-r--r--test/-ext-/string/test_capacity.rb2
-rw-r--r--test/net/imap/test_imap.rb4
-rw-r--r--test/net/imap/test_imap_response_parser.rb2
-rw-r--r--test/pathname/test_pathname.rb2
-rw-r--r--test/ruby/test_array.rb4
-rw-r--r--test/ruby/test_class.rb2
-rw-r--r--test/ruby/test_fiber.rb2
-rw-r--r--test/ruby/test_io.rb2
-rw-r--r--test/ruby/test_syntax.rb4
14 files changed, 18 insertions, 18 deletions
diff --git a/ext/fcntl/fcntl.c b/ext/fcntl/fcntl.c
index 62780b78c0..c93694c431 100644
--- a/ext/fcntl/fcntl.c
+++ b/ext/fcntl/fcntl.c
@@ -68,7 +68,7 @@ Init_fcntl(void)
#ifdef F_DUPFD
/* Document-const: F_DUPFD
*
- * Duplicate a file descriptor to the mimimum unused file descriptor
+ * Duplicate a file descriptor to the minimum unused file descriptor
* greater than or equal to the argument.
*
* The close-on-exec flag of the duplicated file descriptor is set.
diff --git a/ext/socket/lib/socket.rb b/ext/socket/lib/socket.rb
index 0dcff3898b..53d961e680 100644
--- a/ext/socket/lib/socket.rb
+++ b/ext/socket/lib/socket.rb
@@ -446,7 +446,7 @@ class BasicSocket < IO
# Linux-specific optimizations to avoid fcntl for IO#read_nonblock
# and IO#write_nonblock using MSG_DONTWAIT
- # Do other platforms suport MSG_DONTWAIT reliably?
+ # Do other platforms support MSG_DONTWAIT reliably?
if RUBY_PLATFORM =~ /linux/ && Socket.const_defined?(:MSG_DONTWAIT)
def read_nonblock(len, str = nil, exception: true) # :nodoc:
case rv = __recv_nonblock(len, 0, str, exception)
diff --git a/ext/win32/lib/win32/sspi.rb b/ext/win32/lib/win32/sspi.rb
index 20441b389c..8103893d7f 100644
--- a/ext/win32/lib/win32/sspi.rb
+++ b/ext/win32/lib/win32/sspi.rb
@@ -73,7 +73,7 @@ module Win32
end
end
- # Creates binary representaiton of a SecBufferDesc structure,
+ # Creates binary representations of a SecBufferDesc structure,
# including the SecBuffer contained inside.
class SecurityBuffer
diff --git a/lib/net/http/header.rb b/lib/net/http/header.rb
index 8f3206d363..3484b5b681 100644
--- a/lib/net/http/header.rb
+++ b/lib/net/http/header.rb
@@ -77,7 +77,7 @@ module Net::HTTPHeader
else
val = val.to_s
if /[\r\n]/n.match?(val.b)
- raise ArgumentError, 'header field value cannnot include CR/LF'
+ raise ArgumentError, 'header field value cannot include CR/LF'
end
@header[key.downcase] = [val]
end
@@ -90,7 +90,7 @@ module Net::HTTPHeader
else
val = val.to_s
if /[\r\n]/n.match?(val.b)
- raise ArgumentError, 'header field value cannnot include CR/LF'
+ raise ArgumentError, 'header field value cannot include CR/LF'
end
ary.push val
end
diff --git a/lib/racc/rdoc/grammar.en.rdoc b/lib/racc/rdoc/grammar.en.rdoc
index c00e19daff..af10803f3a 100644
--- a/lib/racc/rdoc/grammar.en.rdoc
+++ b/lib/racc/rdoc/grammar.en.rdoc
@@ -16,7 +16,7 @@ You can insert comments about all places. Two styles of comments can be used, Ru
The class block is formed like this:
class CLASS_NAME
- [precedance table]
+ [precedence table]
[token declarations]
[expected number of S/R conflicts]
[options]
diff --git a/test/-ext-/string/test_capacity.rb b/test/-ext-/string/test_capacity.rb
index 6ef5a8c4da..65444123a7 100644
--- a/test/-ext-/string/test_capacity.rb
+++ b/test/-ext-/string/test_capacity.rb
@@ -8,7 +8,7 @@ class Test_StringCapacity < Test::Unit::TestCase
Bug::String.capacity(str)
end
- def test_capacity_embeded
+ def test_capacity_embedded
size = RbConfig::SIZEOF['void*'] * 3 - 1
assert_equal size, capa('foo')
end
diff --git a/test/net/imap/test_imap.rb b/test/net/imap/test_imap.rb
index 0f64e882cc..8e48317dab 100644
--- a/test/net/imap/test_imap.rb
+++ b/test/net/imap/test_imap.rb
@@ -315,7 +315,7 @@ class IMAPTest < Test::Unit::TestCase
imap.idle(0.2) do |res|
responses.push(res)
end
- # There is no gurantee that this thread has received all the responses,
+ # There is no guarantee that this thread has received all the responses,
# so check the response length.
if responses.length > 0
assert_instance_of(Net::IMAP::ContinuationRequest, responses[0])
@@ -328,7 +328,7 @@ class IMAPTest < Test::Unit::TestCase
end
end
end
- # Also, there is no gurantee that the server thread has stored
+ # Also, there is no guarantee that the server thread has stored
# all the requests into the array, so check the length.
if requests.length > 0
assert_equal("RUBY0001 IDLE\r\n", requests[0])
diff --git a/test/net/imap/test_imap_response_parser.rb b/test/net/imap/test_imap_response_parser.rb
index 7aac2786fe..12c8a27017 100644
--- a/test/net/imap/test_imap_response_parser.rb
+++ b/test/net/imap/test_imap_response_parser.rb
@@ -247,7 +247,7 @@ EOF
assert_equal("AUTH=PLAIN", response.data.last)
end
- def test_mixed_boundry
+ def test_mixed_boundary
parser = Net::IMAP::ResponseParser.new
response = parser.parse("* 2688 FETCH (UID 179161 BODYSTRUCTURE (" \
"(\"TEXT\" \"PLAIN\" (\"CHARSET\" \"iso-8859-1\") NIL NIL \"QUOTED-PRINTABLE\" 200 4 NIL NIL NIL)" \
diff --git a/test/pathname/test_pathname.rb b/test/pathname/test_pathname.rb
index caaa788f08..5007ebac22 100644
--- a/test/pathname/test_pathname.rb
+++ b/test/pathname/test_pathname.rb
@@ -544,7 +544,7 @@ class TestPathname < Test::Unit::TestCase
defassert(:pathsubext, 'lex.yy.o', 'lex.yy.c', '.o')
defassert(:pathsubext, 'fooaa.o', 'fooaa', '.o')
defassert(:pathsubext, 'd.e/aa.o', 'd.e/aa', '.o')
- defassert(:pathsubext, 'long_enough.bug-3664', 'long_enough.not_to_be_embeded[ruby-core:31640]', '.bug-3664')
+ defassert(:pathsubext, 'long_enough.bug-3664', 'long_enough.not_to_be_embedded[ruby-core:31640]', '.bug-3664')
def test_sub_matchdata
result = Pathname("abc.gif").sub(/\..*/) {
diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb
index 93576470bd..508312e4a2 100644
--- a/test/ruby/test_array.rb
+++ b/test/ruby/test_array.rb
@@ -2624,8 +2624,8 @@ class TestArray < Test::Unit::TestCase
def test_array_subclass
assert_equal(Array2, Array2[1,2,3].uniq.class, "[ruby-dev:34581]")
- assert_equal(Array2, Array2[1,2][0,1].class) # embeded
- assert_equal(Array2, Array2[*(1..100)][1..99].class) #not embeded
+ assert_equal(Array2, Array2[1,2][0,1].class) # embedded
+ assert_equal(Array2, Array2[*(1..100)][1..99].class) #not embedded
end
def test_inspect
diff --git a/test/ruby/test_class.rb b/test/ruby/test_class.rb
index 5250d4b44a..f2e89c0f26 100644
--- a/test/ruby/test_class.rb
+++ b/test/ruby/test_class.rb
@@ -89,7 +89,7 @@ class TestClass < Test::Unit::TestCase
end
end
- def test_instanciate_singleton_class
+ def test_instantiate_singleton_class
c = class << Object.new; self; end
assert_raise(TypeError) { c.new }
end
diff --git a/test/ruby/test_fiber.rb b/test/ruby/test_fiber.rb
index c9a0b58d70..92c9961259 100644
--- a/test/ruby/test_fiber.rb
+++ b/test/ruby/test_fiber.rb
@@ -234,7 +234,7 @@ class TestFiber < Test::Unit::TestCase
assert_instance_of(Class, Fiber.new(&Class.new.method(:undef_method)).resume(:to_s), bug5083)
end
- def test_prohibit_resume_transfered_fiber
+ def test_prohibit_resume_transferred_fiber
assert_raise(FiberError){
root_fiber = Fiber.current
f = Fiber.new{
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index c7c4129e3e..7920c60262 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -3586,7 +3586,7 @@ __END__
after = ObjectSpace.count_objects(res)[:T_STRING]
assert_equal before, after,
'no strings left over after write [ruby-core:78898] [Bug #13085]'
- assert_not_predicate buf, :frozen?, 'no inadvertant freeze'
+ assert_not_predicate buf, :frozen?, 'no inadvertent freeze'
assert_equal buf.bytesize, n, 'IO#write wrote expected size'
assert_equal s, n, 'IO#syswrite wrote expected size'
end
diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb
index 62b8d65441..beb85272ff 100644
--- a/test/ruby/test_syntax.rb
+++ b/test/ruby/test_syntax.rb
@@ -1041,7 +1041,7 @@ eom
begin;
tap do
result << :begin
- raise "An exception occured!"
+ raise "An exception occurred!"
ensure
result << :ensure
end
@@ -1057,7 +1057,7 @@ eom
begin;
tap do
result << :begin
- raise "An exception occured!"
+ raise "An exception occurred!"
rescue
result << :rescue
else