diff options
| author | kazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-19 14:50:47 +0000 |
|---|---|---|
| committer | kazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-19 14:50:47 +0000 |
| commit | c54733e1206c2d7434610c8f7f2875f082231cfd (patch) | |
| tree | 35c9630ade390f3a9562e2447dc01f024cd37b2c /lib | |
| parent | 66795c47745698b30d42b35831f359aa3c07bf2c (diff) | |
fix typos inspired by r40825
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40829 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/getoptlong.rb | 2 | ||||
| -rw-r--r-- | lib/net/pop.rb | 6 | ||||
| -rw-r--r-- | lib/net/smtp.rb | 12 | ||||
| -rw-r--r-- | lib/rdoc/rd/block_parser.rb | 2 | ||||
| -rw-r--r-- | lib/webrick/httprequest.rb | 2 | ||||
| -rw-r--r-- | lib/xmlrpc/server.rb | 4 |
6 files changed, 14 insertions, 14 deletions
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 |