summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ext/tk/ChangeLog.tkextlib2
-rwxr-xr-xext/tk/lib/tkextlib/pkg_checker.rb2
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb2
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb2
-rw-r--r--lib/getoptlong.rb2
-rw-r--r--lib/net/pop.rb6
-rw-r--r--lib/net/smtp.rb12
-rw-r--r--lib/rdoc/rd/block_parser.rb2
-rw-r--r--lib/webrick/httprequest.rb2
-rw-r--r--lib/xmlrpc/server.rb4
-rw-r--r--process.c6
-rw-r--r--sample/logger/app.rb2
12 files changed, 22 insertions, 22 deletions
diff --git a/ext/tk/ChangeLog.tkextlib b/ext/tk/ChangeLog.tkextlib
index b4775c55fc..52a0b7ea3a 100644
--- a/ext/tk/ChangeLog.tkextlib
+++ b/ext/tk/ChangeLog.tkextlib
@@ -496,7 +496,7 @@ Sat Nov 22 10:31:25 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
2005-04-08 ocean <ocean@ruby-lang.org>
* sample/tkextlib/treectrl/random.rb: fixed typo. (drop node outside of
- widget, or reenter widget while draggging)
+ widget, or reenter widget while dragging)
2005-04-08 ocean <ocean@ruby-lang.org>
diff --git a/ext/tk/lib/tkextlib/pkg_checker.rb b/ext/tk/lib/tkextlib/pkg_checker.rb
index ecc6bfa131..e2fd97bb6a 100755
--- a/ext/tk/lib/tkextlib/pkg_checker.rb
+++ b/ext/tk/lib/tkextlib/pkg_checker.rb
@@ -15,7 +15,7 @@ verbose = false
def help_msg
print "Usage: #{$0} [-l] [-v] [-h] [--] [dir]\n"
- print "\tIf dir is omitted, check the directry that this command exists.\n"
+ print "\tIf dir is omitted, check the directory that this command exists.\n"
print "\tAvailable options are \n"
print "\t -l : Add dir to $LOAD_PATH\n"
print "\t (If dir == '<parent>/tkextlib', add <parent> also.)\n"
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb b/ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb
index 055312ec96..4d460e8802 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb
@@ -23,7 +23,7 @@ TkButton.new(page2CS, :text=>'Button Two').pack
# Select the first page of the tabnotebook.
nb.select(0)
-# Create the scrollbar and associate teh scrollbar
+# Create the scrollbar and associate the scrollbar
# and the notebook together, then pack the scrollbar
nb.scrollbar(TkScrollbar.new).pack(:fill=>:y, :expand=>true, :pady=>10)
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb b/ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb
index 41e9ce1bfc..576a9c18d0 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb
@@ -23,7 +23,7 @@ TkButton.new(page2CS, :text=>'Button Two').pack
# Select the first page of the tabnotebook.
nb.select(0)
-# Create the scrollbar and associate teh scrollbar
+# Create the scrollbar and associate the scrollbar
# and the notebook together, then pack the scrollbar
nb.xscrollbar(TkScrollbar.new).pack(:fill=>:x, :expand=>true, :padx=>10)
diff --git a/lib/getoptlong.rb b/lib/getoptlong.rb
index 259382e8ec..cf635f0438 100644
--- a/lib/getoptlong.rb
+++ b/lib/getoptlong.rb
@@ -356,7 +356,7 @@ class GetoptLong
#
def terminate
return nil if @status == STATUS_TERMINATED
- raise RuntimeError, "an error has occured" if @error != nil
+ raise RuntimeError, "an error has occurred" if @error != nil
@status = STATUS_TERMINATED
@non_option_arguments.reverse_each do |argument|
diff --git a/lib/net/pop.rb b/lib/net/pop.rb
index 74a53951c7..ebf1085d55 100644
--- a/lib/net/pop.rb
+++ b/lib/net/pop.rb
@@ -889,7 +889,7 @@ module Net
def initialize(sock)
@socket = sock
- @error_occured = false
+ @error_occurred = false
res = check_response(critical { recv_response() })
@apop_stamp = res.slice(/<[!-~]+@[!-~]+>/)
end
@@ -1007,11 +1007,11 @@ module Net
end
def critical
- return '+OK dummy ok response' if @error_occured
+ return '+OK dummy ok response' if @error_occurred
begin
return yield()
rescue Exception
- @error_occured = true
+ @error_occurred = true
raise
end
end
diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb
index 01f8b2b1f0..4ed7e746d9 100644
--- a/lib/net/smtp.rb
+++ b/lib/net/smtp.rb
@@ -215,7 +215,7 @@ module Net
@started = false
@open_timeout = 30
@read_timeout = 60
- @error_occured = false
+ @error_occurred = false
@debug_output = nil
@tls = false
@starttls = false
@@ -605,17 +605,17 @@ module Net
rescue SMTPError
if @esmtp
@esmtp = false
- @error_occured = false
+ @error_occurred = false
retry
end
raise
end
def do_finish
- quit if @socket and not @socket.closed? and not @error_occured
+ quit if @socket and not @socket.closed? and not @error_occurred
ensure
@started = false
- @error_occured = false
+ @error_occurred = false
@socket.close if @socket and not @socket.closed?
@socket = nil
end
@@ -942,11 +942,11 @@ module Net
end
def critical
- return '200 dummy reply code' if @error_occured
+ return '200 dummy reply code' if @error_occurred
begin
return yield()
rescue Exception
- @error_occured = true
+ @error_occurred = true
raise
end
end
diff --git a/lib/rdoc/rd/block_parser.rb b/lib/rdoc/rd/block_parser.rb
index b52454c689..bd08677fcf 100644
--- a/lib/rdoc/rd/block_parser.rb
+++ b/lib/rdoc/rd/block_parser.rb
@@ -253,7 +253,7 @@ def next_token # :nodoc:
[:STRINGLINE, line]
end
else
- raise "[BUG] parsing error may occured."
+ raise "[BUG] parsing error may occurred."
end
end
diff --git a/lib/webrick/httprequest.rb b/lib/webrick/httprequest.rb
index 10b9e6131e..76420730b1 100644
--- a/lib/webrick/httprequest.rb
+++ b/lib/webrick/httprequest.rb
@@ -359,7 +359,7 @@ module WEBrick
begin
body{|chunk| } # read remaining body
rescue HTTPStatus::Error => ex
- @logger.error("HTTPRequest#fixup: #{ex.class} occured.")
+ @logger.error("HTTPRequest#fixup: #{ex.class} occurred.")
@keep_alive = false
rescue => ex
@logger.error(ex)
diff --git a/lib/xmlrpc/server.rb b/lib/xmlrpc/server.rb
index 839353da1a..c16375b405 100644
--- a/lib/xmlrpc/server.rb
+++ b/lib/xmlrpc/server.rb
@@ -430,7 +430,7 @@ class CGIServer < BasicServer
</head>
<body>
<h1>#{err}</h1>
- <p>Unexpected error occured while processing XML-RPC request!</p>
+ <p>Unexpected error occurred while processing XML-RPC request!</p>
</body>
</html>
MSGEND
@@ -505,7 +505,7 @@ class ModRubyServer < BasicServer
</head>
<body>
<h1>#{err}</h1>
- <p>Unexpected error occured while processing XML-RPC request!</p>
+ <p>Unexpected error occurred while processing XML-RPC request!</p>
</body>
</html>
MSGEND
diff --git a/process.c b/process.c
index 66e910af71..e9e0fc88fd 100644
--- a/process.c
+++ b/process.c
@@ -3312,7 +3312,7 @@ rb_fork_internal(int *status, int (*chfunc)(void*, char *, size_t), void *charg,
int err, state = 0;
int ep[2];
VALUE exc = Qnil;
- int error_occured;
+ int error_occurred;
if (status) *status = 0;
@@ -3358,8 +3358,8 @@ rb_fork_internal(int *status, int (*chfunc)(void*, char *, size_t), void *charg,
#endif
}
close(ep[1]);
- error_occured = recv_child_error(ep[0], &state, &exc, &err, errmsg, errmsg_buflen, chfunc_is_async_signal_safe);
- if (state || error_occured) {
+ error_occurred = recv_child_error(ep[0], &state, &exc, &err, errmsg, errmsg_buflen, chfunc_is_async_signal_safe);
+ if (state || error_occurred) {
if (status) {
rb_protect(proc_syswait, (VALUE)pid, status);
if (state) *status = state;
diff --git a/sample/logger/app.rb b/sample/logger/app.rb
index 924bcba4b0..97b62bca30 100644
--- a/sample/logger/app.rb
+++ b/sample/logger/app.rb
@@ -41,6 +41,6 @@ end
status = MyApp.new(1, 2, 3).start
if status != 0
- puts 'Some error(s) occured.'
+ puts 'Some error(s) occurred.'
puts 'See "app.log".'
end
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-14 06:12:21 +0000