From d9a2b3480ef03b79ea9070de0646d2372491a915 Mon Sep 17 00:00:00 2001 From: hsbt Date: Wed, 15 Apr 2015 01:37:47 +0000 Subject: [PATCH] * doc/contributors.rdoc: fix a typo. Patch by @davydovanton [fix GH-872][ci skip] * doc/syntax/methods.rdoc: ditto. * ext/digest/sha2/sha2.c: ditto. * ext/socket/ipsocket.c: ditto. * ext/tk/*: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50320 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 +++++++++ bignum.c | 2 +- doc/contributors.rdoc | 2 +- doc/syntax/methods.rdoc | 2 +- ext/digest/sha2/sha2.c | 2 +- ext/socket/ipsocket.c | 4 ++-- ext/tk/MANUAL_tcltklib.eng | 4 ++-- ext/tk/README.macosx-aqua | 2 +- ext/tk/extconf.rb | 2 +- ext/tk/lib/README | 2 +- ext/tk/lib/multi-tk.rb | 2 +- ext/tk/lib/tk/fontchooser.rb | 2 +- gc.c | 2 +- 13 files changed, 23 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index a279220b1e..cb2a0712f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Wed Apr 15 10:37:40 2015 SHIBATA Hiroshi + + * doc/contributors.rdoc: fix a typo. Patch by @davydovanton + [fix GH-872][ci skip] + * doc/syntax/methods.rdoc: ditto. + * ext/digest/sha2/sha2.c: ditto. + * ext/socket/ipsocket.c: ditto. + * ext/tk/*: ditto. + Wed Apr 15 07:51:23 2015 Yuki Yugui Sonoda * doc/extension.ja.rdoc: Added description of TypedData_XXX. diff --git a/bignum.c b/bignum.c index dfbe2ecec9..a962dbac36 100644 --- a/bignum.c +++ b/bignum.c @@ -173,7 +173,7 @@ static int nlz(BDIGIT x) { return nlz_int128((uint128_t)x) - (SIZEOF_INT128_T-SI #define U128(a,b,c,d) (((uint128_t)U64(a,b) << 64) | U64(c,d)) #endif -/* The following scirpt, maxpow.rb, generates the tables follows. +/* The following script, maxpow.rb, generates the tables follows. def big(n, bits) ns = [] diff --git a/doc/contributors.rdoc b/doc/contributors.rdoc index 96fe887e4e..ced4eb1cd0 100644 --- a/doc/contributors.rdoc +++ b/doc/contributors.rdoc @@ -1,6 +1,6 @@ = Contributors to Ruby -The following list might be imcomplete. Feel free to add your name if your +The following list might be incomplete. Feel free to add your name if your patch was accepted into Ruby. == A diff --git a/doc/syntax/methods.rdoc b/doc/syntax/methods.rdoc index debfa76cbf..c8fc584c68 100644 --- a/doc/syntax/methods.rdoc +++ b/doc/syntax/methods.rdoc @@ -55,7 +55,7 @@ it indicates that unlike its non-bang equivalent, permanently modifies its receiver. Almost always, Ruby core library will have a non-bang counterpart (method name which does NOT end with !) of every bang method (method name which does end with !) that does not modify -the receiver. This convention is typically true for ruby core libary but +the receiver. This convention is typically true for ruby core library but may or may not hold true for other ruby libraries. Methods that end with a question mark by convention return boolean. But they diff --git a/ext/digest/sha2/sha2.c b/ext/digest/sha2/sha2.c index d0629a2b64..1d29ee2d76 100644 --- a/ext/digest/sha2/sha2.c +++ b/ext/digest/sha2/sha2.c @@ -67,7 +67,7 @@ * Please make sure that your system defines BYTE_ORDER. If your * architecture is little-endian, make sure it also defines * LITTLE_ENDIAN and that the two (BYTE_ORDER and LITTLE_ENDIAN) are - * equivilent. + * equivalent. * * If your system does not define the above, then you can do so by * hand like this: diff --git a/ext/socket/ipsocket.c b/ext/socket/ipsocket.c index ef5ce763ec..c84023daa2 100644 --- a/ext/socket/ipsocket.c +++ b/ext/socket/ipsocket.c @@ -193,7 +193,7 @@ rsock_revlookup_flag(VALUE revlookup, int *norevlookup) * hostname is obtained from numeric_address using reverse lookup. * Or if it is +false+, or +:numeric+, * hostname is same as numeric_address. - * Or if it is +nil+ or ommitted, obeys to +ipsocket.do_not_reverse_lookup+. + * Or if it is +nil+ or omitted, obeys to +ipsocket.do_not_reverse_lookup+. * See +Socket.getaddrinfo+ also. * * TCPSocket.open("www.ruby-lang.org", 80) {|sock| @@ -234,7 +234,7 @@ ip_addr(int argc, VALUE *argv, VALUE sock) * hostname is obtained from numeric_address using reverse lookup. * Or if it is +false+, or +:numeric+, * hostname is same as numeric_address. - * Or if it is +nil+ or ommitted, obeys to +ipsocket.do_not_reverse_lookup+. + * Or if it is +nil+ or omitted, obeys to +ipsocket.do_not_reverse_lookup+. * See +Socket.getaddrinfo+ also. * * TCPSocket.open("www.ruby-lang.org", 80) {|sock| diff --git a/ext/tk/MANUAL_tcltklib.eng b/ext/tk/MANUAL_tcltklib.eng index 957e8ec840..94b21950a6 100644 --- a/ext/tk/MANUAL_tcltklib.eng +++ b/ext/tk/MANUAL_tcltklib.eng @@ -1,7 +1,7 @@ (tof) 2005/07/05 Hidetoshi NAGAI -This document discribes about the 'tcltklib' library. Although there +This document describes about the 'tcltklib' library. Although there is the 'tcltk' library (tcltk.rb) under this directory, no description in this document (because it is not maintained recently). @@ -215,7 +215,7 @@ module TclTklib mainloop_abort_on_exception=(bool) : Define whether the eventloop stops on exception or not. : If true (default value), stops on exception. - : If false, show a waring message but ignore the exception. + : If false, show a warning message but ignore the exception. : If nil, no warning message and ignore the exception. : This parameter is sometimes useful when multiple Tk : interpreters are working. Because the only one eventloop diff --git a/ext/tk/README.macosx-aqua b/ext/tk/README.macosx-aqua index 15630727ec..52edf4dcbf 100644 --- a/ext/tk/README.macosx-aqua +++ b/ext/tk/README.macosx-aqua @@ -3,7 +3,7 @@ First of all, please read README.tcltklib to use Tcl/Tk Aqua Framework. -With Tcl/Tk Aqua libraries, current tcltklib somtimes freezes when +With Tcl/Tk Aqua libraries, current tcltklib sometimes freezes when using Aqua specific dialogs (e.g. Tk.messageBox). This is a known bug of Ruby-1.8.4 release. diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb index c6a2dd52ff..12bccd58f7 100644 --- a/ext/tk/extconf.rb +++ b/ext/tk/extconf.rb @@ -1646,7 +1646,7 @@ def pthread_check() if TclConfig_Info['config_file_path'] if tcl_enable_thread == true - puts("Warning: definiton of tclConfig.sh is ignored, because --enable-tcl-thread option is given.") + puts("Warning: definition of tclConfig.sh is ignored, because --enable-tcl-thread option is given.") elsif tcl_enable_thread == false puts("Warning: definition of tclConfig.sh is ignored, because --disable-tcl-thread option is given.") else diff --git a/ext/tk/lib/README b/ext/tk/lib/README index c076755756..df1c7906ea 100644 --- a/ext/tk/lib/README +++ b/ext/tk/lib/README @@ -23,7 +23,7 @@ tkfont.rb Tk font support tkmacpkg.rb Mac resource support tkmenubar.rb TK menubar utility tkmngfocus.rb focus manager -tkpalette.rb pallete support +tkpalette.rb palette support tkscrollbox.rb scroll box, also example of compound widget tktext.rb text classes tkvirtevent.rb virtual event support diff --git a/ext/tk/lib/multi-tk.rb b/ext/tk/lib/multi-tk.rb index bb6e69aab6..5129a6e862 100644 --- a/ext/tk/lib/multi-tk.rb +++ b/ext/tk/lib/multi-tk.rb @@ -2475,7 +2475,7 @@ end # event loop -# all master/slave IPs are controled by only one event-loop +# all master/slave IPs are controlled by only one event-loop class MultiTkIp def self.default_master? __getip == @@DEFAULT_MASTER diff --git a/ext/tk/lib/tk/fontchooser.rb b/ext/tk/lib/tk/fontchooser.rb index 22d70f9c0a..6dab0c6cf9 100644 --- a/ext/tk/lib/tk/fontchooser.rb +++ b/ext/tk/lib/tk/fontchooser.rb @@ -51,7 +51,7 @@ class << TkFont::Chooser tk_tcl2ruby(val) when 'visible' bool(val) - else # unkown + else # unknown val end end diff --git a/gc.c b/gc.c index 874ff76e6f..6b8cd7e0e9 100644 --- a/gc.c +++ b/gc.c @@ -649,7 +649,7 @@ struct heap_page { #if USE_RGENGC bits_t wb_unprotected_bits[HEAP_BITMAP_LIMIT]; #endif - /* the following three bitmaps are cleared at the beggining of full GC */ + /* the following three bitmaps are cleared at the beginning of full GC */ bits_t mark_bits[HEAP_BITMAP_LIMIT]; #if USE_RGENGC bits_t uncollectible_bits[HEAP_BITMAP_LIMIT];