ruby-changes:32312
From: nagachika <ko1@a...>
Date: Wed, 25 Dec 2013 00:46:10 +0900 (JST)
Subject: [ruby-changes:32312] nagachika:r44391 (ruby_2_0_0): merge revision(s) 40829:
nagachika 2013-12-25 00:46:01 +0900 (Wed, 25 Dec 2013) New Revision: 44391 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=44391 Log: merge revision(s) 40829: fix typos inspired by r40825 Modified directories: branches/ruby_2_0_0/ Modified files: branches/ruby_2_0_0/ext/tk/ChangeLog.tkextlib branches/ruby_2_0_0/ext/tk/lib/tkextlib/pkg_checker.rb branches/ruby_2_0_0/ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb branches/ruby_2_0_0/ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb branches/ruby_2_0_0/lib/getoptlong.rb branches/ruby_2_0_0/lib/net/pop.rb branches/ruby_2_0_0/lib/net/smtp.rb branches/ruby_2_0_0/lib/rdoc/rd/block_parser.rb branches/ruby_2_0_0/lib/webrick/httprequest.rb branches/ruby_2_0_0/lib/xmlrpc/server.rb branches/ruby_2_0_0/process.c branches/ruby_2_0_0/sample/logger/app.rb branches/ruby_2_0_0/version.h Index: ruby_2_0_0/sample/logger/app.rb =================================================================== --- ruby_2_0_0/sample/logger/app.rb (revision 44390) +++ ruby_2_0_0/sample/logger/app.rb (revision 44391) @@ -41,6 +41,6 @@ end https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/sample/logger/app.rb#L41 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 Index: ruby_2_0_0/lib/xmlrpc/server.rb =================================================================== --- ruby_2_0_0/lib/xmlrpc/server.rb (revision 44390) +++ ruby_2_0_0/lib/xmlrpc/server.rb (revision 44391) @@ -430,7 +430,7 @@ class CGIServer < BasicServer https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/xmlrpc/server.rb#L430 </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 https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/xmlrpc/server.rb#L505 </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 Index: ruby_2_0_0/lib/webrick/httprequest.rb =================================================================== --- ruby_2_0_0/lib/webrick/httprequest.rb (revision 44390) +++ ruby_2_0_0/lib/webrick/httprequest.rb (revision 44391) @@ -359,7 +359,7 @@ module WEBrick https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/webrick/httprequest.rb#L359 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) Index: ruby_2_0_0/lib/getoptlong.rb =================================================================== --- ruby_2_0_0/lib/getoptlong.rb (revision 44390) +++ ruby_2_0_0/lib/getoptlong.rb (revision 44391) @@ -356,7 +356,7 @@ class GetoptLong https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/getoptlong.rb#L356 # 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| Index: ruby_2_0_0/lib/rdoc/rd/block_parser.rb =================================================================== --- ruby_2_0_0/lib/rdoc/rd/block_parser.rb (revision 44390) +++ ruby_2_0_0/lib/rdoc/rd/block_parser.rb (revision 44391) @@ -253,7 +253,7 @@ def next_token # :nodoc: https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/rdoc/rd/block_parser.rb#L253 [:STRINGLINE, line] end else - raise "[BUG] parsing error may occured." + raise "[BUG] parsing error may occurred." end end Index: ruby_2_0_0/lib/net/pop.rb =================================================================== --- ruby_2_0_0/lib/net/pop.rb (revision 44390) +++ ruby_2_0_0/lib/net/pop.rb (revision 44391) @@ -889,7 +889,7 @@ module Net https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/net/pop.rb#L889 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 https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/net/pop.rb#L1007 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 Index: ruby_2_0_0/lib/net/smtp.rb =================================================================== --- ruby_2_0_0/lib/net/smtp.rb (revision 44390) +++ ruby_2_0_0/lib/net/smtp.rb (revision 44391) @@ -215,7 +215,7 @@ module Net https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/net/smtp.rb#L215 @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 https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/net/smtp.rb#L605 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 @@ -936,11 +936,11 @@ module Net https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/net/smtp.rb#L936 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 Index: ruby_2_0_0/process.c =================================================================== --- ruby_2_0_0/process.c (revision 44390) +++ ruby_2_0_0/process.c (revision 44391) @@ -3312,7 +3312,7 @@ rb_fork_internal(int *status, int (*chfu https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/process.c#L3312 int err, state = 0; int ep[2]; VALUE exc = Qnil; - int error_occured; + int error_occurred; if (status) *status = 0; @@ -3354,8 +3354,8 @@ rb_fork_internal(int *status, int (*chfu https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/process.c#L3354 #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; Index: ruby_2_0_0/ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb =================================================================== --- ruby_2_0_0/ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb (revision 44390) +++ ruby_2_0_0/ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb (revision 44391) @@ -23,7 +23,7 @@ TkButton.new(page2CS, :text=>'Button Two https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb#L23 # 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) Index: ruby_2_0_0/ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb =================================================================== --- ruby_2_0_0/ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb (revision 44390) +++ ruby_2_0_0/ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb (revision 44391) @@ -23,7 +23,7 @@ TkButton.new(page2CS, :text=>'Button Two https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb#L23 # 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) Index: ruby_2_0_0/ext/tk/lib/tkextlib/pkg_checker.rb =================================================================== --- ruby_2_0_0/ext/tk/lib/tkextlib/pkg_checker.rb (revision 44390) +++ ruby_2_0_0/ext/tk/lib/tkextlib/pkg_checker.rb (revision 44391) @@ -15,7 +15,7 @@ verbose = false https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/tk/lib/tkextlib/pkg_checker.rb#L15 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" Index: ruby_2_0_0/ext/tk/ChangeLog.tkextlib =================================================================== --- ruby_2_0_0/ext/tk/ChangeLog.tkextlib (revision 44390) +++ ruby_2_0_0/ext/tk/ChangeLog.tkextlib (revision 44391) @@ -496,7 +496,7 @@ Sat Nov 22 10:31:25 2008 Hidetoshi NAGA https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/tk/ChangeLog.tkextlib#L496 2005-04-08 ocean <ocean@r...> * 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@r...> Index: ruby_2_0_0/version.h =================================================================== --- ruby_2_0_0/version.h (revision 44390) +++ ruby_2_0_0/version.h (revision 44391) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1 #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-12-25" -#define RUBY_PATCHLEVEL 374 +#define RUBY_PATCHLEVEL 375 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 12 Property changes on: ruby_2_0_0 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r40829 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/