aboutsummaryrefslogtreecommitdiffstats
path: root/ext/tk
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-04-15 01:37:47 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-04-15 01:37:47 +0000
commitd9a2b3480ef03b79ea9070de0646d2372491a915 (patch)
treec91bde622faf36fec66321c9631ff5e3b035da88 /ext/tk
parent14ec77d1793767fb00cdf2f945ec7e5d7a1ae8bc (diff)
downloadruby-d9a2b3480ef03b79ea9070de0646d2372491a915.tar.gz
* 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
Diffstat (limited to 'ext/tk')
-rw-r--r--ext/tk/MANUAL_tcltklib.eng4
-rw-r--r--ext/tk/README.macosx-aqua2
-rw-r--r--ext/tk/extconf.rb2
-rw-r--r--ext/tk/lib/README2
-rw-r--r--ext/tk/lib/multi-tk.rb2
-rw-r--r--ext/tk/lib/tk/fontchooser.rb2
6 files changed, 7 insertions, 7 deletions
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