fix [2021443] inconsistant "wrong # args" messages (for Tk)

33 files changed, 108 insertions, 108 deletions

diff --git a/tests/bind.test b/tests/bind.test
index 7e0257c..77b8373 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: bind.test,v 1.19 2007/05/16 15:23:44 dgp Exp $
+# RCS: @(#) $Id: bind.test,v 1.20 2008/07/23 23:24:26 nijtmans Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -1595,7 +1595,7 @@ test bind-17.6 {event command: add with error} {
 } {1 {bad event type or keysym "xyz"} {<Button-2> <Control-Key-v> abc}}
 test bind-17.7 {event command: delete} {
     list [catch {event delete} msg] $msg
-} {1 {wrong # args: should be "event delete virtual ?sequence sequence ...?"}}
+} {1 {wrong # args: should be "event delete virtual ?sequence ...?"}}
 test bind-17.8 {event command: delete many} {
     setup
     event add <<Paste>> <3> <1> <2> t
@@ -1630,7 +1630,7 @@ test bind-17.13 {event command: info error} {
 } {1 {wrong # args: should be "event info ?virtual?"}}
 test bind-17.14 {event command: generate} {
     list [catch {event generate} msg] $msg
-} {1 {wrong # args: should be "event generate window event ?options?"}}
+} {1 {wrong # args: should be "event generate window event ?-option value ...?"}}
 test bind-17.15 {event command: generate} {
     setup
     bind .b.f <1> "lappend x 1"
diff --git a/tests/button.test b/tests/button.test
index 4bc0929..bfa621c 100644
--- a/tests/button.test
+++ b/tests/button.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: button.test,v 1.22 2008/07/22 13:17:26 aniap Exp $
+# RCS: @(#) $Id: button.test,v 1.23 2008/07/23 23:24:25 nijtmans Exp $
 
 package require tcltest 2.2
 namespace import ::tcltest::*
@@ -2673,7 +2673,7 @@ test button-1.270 {configuration options} -body {
 # ex-tests 3.*
 test button-2.1 {ButtonCreate - not enough arguments} -body {   
     button
-} -returnCodes {error} -result {wrong # args: should be "button pathName ?options?"}
+} -returnCodes {error} -result {wrong # args: should be "button pathName ?-option value ...?"}
 
 test button-2.2 {ButtonCreate procedure - setting label class} -body {
     label .x
@@ -2758,7 +2758,7 @@ test button-3.1 {ButtonWidgetCmd - too few arguments} -body {
     .b
 } -cleanup {
     destroy .b
-} -returnCodes {error} -result {wrong # args: should be ".b option ?arg arg ...?"}
+} -returnCodes {error} -result {wrong # args: should be ".b option ?arg ...?"}
 test button-3.2 {ButtonWidgetCmd - bad option name} -body {
     button .b
     .b c
diff --git a/tests/canvRect.test b/tests/canvRect.test
index 07f3e91..975c71a 100644
--- a/tests/canvRect.test
+++ b/tests/canvRect.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: canvRect.test,v 1.8 2004/05/23 17:34:48 dkf Exp $
+# RCS: @(#) $Id: canvRect.test,v 1.9 2008/07/23 23:24:26 nijtmans Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -53,7 +53,7 @@ test canvRect-1.$i {configuration options} {
 
 test canvRect-2.1 {CreateRectOval procedure} {
     list [catch {.c create rect} msg] $msg
-} {1 {wrong # args: should be ".c create rect coords ?arg arg ...?"}}
+} {1 {wrong # args: should be ".c create rect coords ?arg ...?"}}
 test canvRect-2.2 {CreateRectOval procedure} {
     list [catch {.c create oval x y z} msg] $msg
 } {1 {wrong # coordinates: expected 0 or 4, got 3}}
diff --git a/tests/canvText.test b/tests/canvText.test
index 1650f62..5367681 100644
--- a/tests/canvText.test
+++ b/tests/canvText.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: canvText.test,v 1.16 2006/01/12 13:38:22 dkf Exp $
+# RCS: @(#) $Id: canvText.test,v 1.17 2008/07/23 23:24:25 nijtmans Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -59,7 +59,7 @@ test canvText-1.$i {configuration options} {
 
 test canvText-2.1 {CreateText procedure: args} {
     list [catch {.c create text} msg] $msg
-} {1 {wrong # args: should be ".c create text coords ?arg arg ...?"}}
+} {1 {wrong # args: should be ".c create text coords ?arg ...?"}}
 test canvText-2.2 {CreateText procedure: args} {
     list [catch {.c create text xyz 0} msg] $msg
 } {1 {bad screen distance "xyz"}}
diff --git a/tests/canvas.test b/tests/canvas.test
index 489ba27..200fe55 100644
--- a/tests/canvas.test
+++ b/tests/canvas.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-2000 Ajuba Solutions.
 # All rights reserved.
 #
-# RCS: @(#) $Id: canvas.test,v 1.23 2004/12/07 21:22:19 dgp Exp $
+# RCS: @(#) $Id: canvas.test,v 1.24 2008/07/23 23:24:26 nijtmans Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -491,7 +491,7 @@ foreach type {arc bitmap image line oval polygon rect text window} {
 	canvas .c
     } -body {
 	.c create $type
-    } -returnCodes error -result [format {wrong # args: should be ".c create %s coords ?arg arg ...?"} $type]
+    } -returnCodes error -result [format {wrong # args: should be ".c create %s coords ?arg ...?"} $type]
     incr i
     test canvas-15.$i "basic coords check: $type coords are paired" -setup {
 	destroy .c
diff --git a/tests/clipboard.test b/tests/clipboard.test
index bca910b..5248cc9 100644
--- a/tests/clipboard.test
+++ b/tests/clipboard.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: clipboard.test,v 1.9 2004/06/24 12:45:42 dkf Exp $
+# RCS: @(#) $Id: clipboard.test,v 1.10 2008/07/23 23:24:25 nijtmans Exp $
 
 #
 # Note: Multiple display clipboard handling will only be tested if the
@@ -181,7 +181,7 @@ test clipboard-6.3 {Tk_ClipboardAppend procedure} {
 
 test clipboard-7.1 {Tk_ClipboardCmd procedure} {
     list [catch {clipboard} msg] $msg
-} {1 {wrong # args: should be "clipboard option ?arg arg ...?"}}
+} {1 {wrong # args: should be "clipboard option ?arg ...?"}}
 test clipboard-7.2 {Tk_ClipboardCmd procedure} {
     clipboard clear
     list [catch {clipboard append --} msg] $msg \
@@ -197,7 +197,7 @@ test clipboard-7.4 {Tk_ClipboardCmd procedure} {
 } {1 {bad option "--x": must be -displayof, -format, or -type}}
 test clipboard-7.5 {Tk_ClipboardCmd procedure} {
     list [catch {clipboard append -- a b} msg] $msg
-} {1 {wrong # args: should be "clipboard append ?options? data"}}
+} {1 {wrong # args: should be "clipboard append ?-option value ...? data"}}
 test clipboard-7.6 {Tk_ClipboardCmd procedure} {
     clipboard clear
     list [catch {clipboard append -format} msg] $msg \
@@ -208,7 +208,7 @@ test clipboard-7.7 {Tk_ClipboardCmd procedure} {
 } {1 {bad option "-displayofoo": must be -displayof, -format, or -type}}
 test clipboard-7.8 {Tk_ClipboardCmd procedure} {
     list [catch {clipboard append -type TEST} msg] $msg
-} {1 {wrong # args: should be "clipboard append ?options? data"}}
+} {1 {wrong # args: should be "clipboard append ?-option value ...? data"}}
 test clipboard-7.9 {Tk_ClipboardCmd procedure} {
     list [catch {clipboard append -displayof foo "test"} msg] $msg
 } {1 {bad window path name "foo"}}
diff --git a/tests/entry.test b/tests/entry.test
index 83d16a0..51ff390 100644
--- a/tests/entry.test
+++ b/tests/entry.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: entry.test,v 1.23 2008/07/22 11:55:57 aniap Exp $
+# RCS: @(#) $Id: entry.test,v 1.24 2008/07/23 23:24:25 nijtmans Exp $
 
 package require tcltest 2.2
 namespace import ::tcltest::*
@@ -633,7 +633,7 @@ test entry-1.58 {configuration option: "xscrollcommand" for entry} -setup {
 
 test entry-2.1 {Tk_EntryCmd procedure} -body {
     entry
-} -returnCodes error -result {wrong # args: should be "entry pathName ?options?"}
+} -returnCodes error -result {wrong # args: should be "entry pathName ?-option value ...?"}
 test entry-2.2 {Tk_EntryCmd procedure} -body {
     entry gorp
 } -returnCodes error -result {bad window path name "gorp"}
@@ -671,7 +671,7 @@ test entry-3.1 {EntryWidgetCmd procedure} -setup {
     .e
 } -cleanup {
     destroy .e
-} -returnCodes error -result {wrong # args: should be ".e option ?arg arg ...?"}
+} -returnCodes error -result {wrong # args: should be ".e option ?arg ...?"}
 test entry-3.2 {EntryWidgetCmd procedure, "bbox" widget command} -setup {
     entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
     pack .e
diff --git a/tests/font.test b/tests/font.test
index cb06512..b31bf5a 100644
--- a/tests/font.test
+++ b/tests/font.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: font.test,v 1.17 2007/12/13 15:27:54 dgp Exp $
+# RCS: @(#) $Id: font.test,v 1.18 2008/07/23 23:24:25 nijtmans Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -153,7 +153,7 @@ test font-4.11 {font command: bad option} {
 test font-5.1 {font command: configure} {
     # (objc < 3) 
     list [catch {font configure} msg] $msg
-} {1 {wrong # args: should be "font configure fontname ?options?"}}
+} {1 {wrong # args: should be "font configure fontname ?-option value ...?"}}
 test font-5.2 {font command: configure: non-existent font} {
     # (namedHashPtr == NULL)
     list [catch {font configure xyz} msg] $msg
diff --git a/tests/frame.test b/tests/frame.test
index b7f9493..6eaa356 100644
--- a/tests/frame.test
+++ b/tests/frame.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: frame.test,v 1.16 2007/05/11 12:36:04 patthoyts Exp $
+# RCS: @(#) $Id: frame.test,v 1.17 2008/07/23 23:24:25 nijtmans Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -259,7 +259,7 @@ foreach test {
 
 test frame-3.1 {TkCreateFrame procedure} -body {
     frame
-} -returnCodes error -result {wrong # args: should be "frame pathName ?options?"}
+} -returnCodes error -result {wrong # args: should be "frame pathName ?-option value ...?"}
 test frame-3.2 {TkCreateFrame procedure} -setup {
     catch {destroy .f}
     frame .f
@@ -499,7 +499,7 @@ catch {destroy .f}
 frame .f -highlightcolor black
 test frame-5.1 {FrameWidgetCommand procedure} {
     list [catch .f msg] $msg
-} {1 {wrong # args: should be ".f option ?arg arg ...?"}}
+} {1 {wrong # args: should be ".f option ?arg ...?"}}
 test frame-5.2 {FrameWidgetCommand procedure, cget option} {
     list [catch {.f cget} msg] $msg
 } {1 {wrong # args: should be ".f cget option"}}
diff --git a/tests/grab.test b/tests/grab.test
index d2ee4b2..3baf7a5 100644
--- a/tests/grab.test
+++ b/tests/grab.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-2000 by Ajuba Solutions.
 # All rights reserved.
 #
-# RCS: @(#) $Id: grab.test,v 1.3 2003/04/01 21:06:35 dgp Exp $
+# RCS: @(#) $Id: grab.test,v 1.4 2008/07/23 23:24:24 nijtmans Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -19,13 +19,13 @@ tcltest::loadTestedCommands
 
 test grab-1.1 {Tk_GrabObjCmd} {
     list [catch {grab} msg] $msg
-} [list 1 "wrong # args: should be \"grab ?-global? window\" or \"grab option ?arg arg ...?\""]
+} [list 1 "wrong # args: should be \"grab ?-global? window\" or \"grab option ?arg ...?\""]
 test grab-1.2 {Tk_GrabObjCmd} {
     rename grab grabTest1.2
     set res [list [catch {grabTest1.2} msg] $msg]
     rename grabTest1.2 grab
     set res
-} [list 1 "wrong # args: should be \"grabTest1.2 ?-global? window\" or \"grabTest1.2 option ?arg arg ...?\""]
+} [list 1 "wrong # args: should be \"grabTest1.2 ?-global? window\" or \"grabTest1.2 option ?arg ...?\""]
 
 test grab-1.3 {Tk_GrabObjCmd, "grab ?-global? window"} {
     list [catch {grab .foo bar baz} msg] $msg
diff --git a/tests/grid.test b/tests/grid.test
index d6e3e88..a8b72cc 100644
--- a/tests/grid.test
+++ b/tests/grid.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: grid.test,v 1.31 2007/03/09 00:46:17 jenglish Exp $
+# RCS: @(#) $Id: grid.test,v 1.32 2008/07/23 23:24:25 nijtmans Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -511,7 +511,7 @@ test grid-9.2 {slaves} {
 
 test grid-9.3 {slaves} {
 	list [catch {grid slaves a b} msg] $msg
-} {1 {wrong # args: should be "grid slaves window ?-option value...?"}}
+} {1 {wrong # args: should be "grid slaves window ?-option value ...?"}}
 
 test grid-9.4 {slaves} {
 	list [catch {grid slaves . a b} msg] $msg
@@ -568,12 +568,12 @@ grid_reset 9.11
 
 test grid-10.1 {column/row configure} {
 	list [catch {grid columnconfigure .} msg] $msg
-} {1 {wrong # args: should be "grid columnconfigure master index ?-option value...?"}}
+} {1 {wrong # args: should be "grid columnconfigure master index ?-option value ...?"}}
 grid_reset 10.1
 
 test grid-10.2 {column/row configure} {
 	list [catch {grid columnconfigure . 0 -weight 0 -pad} msg] $msg
-} {1 {wrong # args: should be "grid columnconfigure master index ?-option value...?"}}
+} {1 {wrong # args: should be "grid columnconfigure master index ?-option value ...?"}}
 grid_reset 10.2
 
 test grid-10.3 {column/row configure} {
diff --git a/tests/image.test b/tests/image.test
index 01951e3..b6f9ec7 100644
--- a/tests/image.test
+++ b/tests/image.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: image.test,v 1.14 2007/05/14 20:58:27 dgp Exp $
+# RCS: @(#) $Id: image.test,v 1.15 2008/07/23 23:24:25 nijtmans Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -26,7 +26,7 @@ test image-1.2 {Tk_ImageCmd procedure, "create" option} {
 } {1 {bad option "gorp": must be create, delete, height, inuse, names, type, types, or width}}
 test image-1.3 {Tk_ImageCmd procedure, "create" option} {
     list [catch {image create} msg] $msg
-} {1 {wrong # args: should be "image create type ?name? ?options?"}}
+} {1 {wrong # args: should be "image create type ?name? ?-option value ...?"}}
 test image-1.4 {Tk_ImageCmd procedure, "create" option} {
     list [catch {image c bad_type} msg] $msg
 } {1 {image type "bad_type" doesn't exist}}
diff --git a/tests/imgBmap.test b/tests/imgBmap.test
index 8849f73..ffb8e29 100644
--- a/tests/imgBmap.test
+++ b/tests/imgBmap.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: imgBmap.test,v 1.6 2004/05/23 17:34:48 dkf Exp $
+# RCS: @(#) $Id: imgBmap.test,v 1.7 2008/07/23 23:24:25 nijtmans Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -339,7 +339,7 @@ eval image delete [image names]
 image create bitmap i1
 test imageBmap-7.1 {ImgBmapCmd procedure} {
     list [catch {i1} msg] $msg
-} {1 {wrong # args: should be "i1 option ?arg arg ...?"}}
+} {1 {wrong # args: should be "i1 option ?arg ...?"}}
 test imageBmap-7.2 {ImgBmapCmd procedure, "cget" option} {
     list [catch {i1 cget} msg] $msg
 } {1 {wrong # args: should be "i1 cget option"}}
diff --git a/tests/imgPhoto.test b/tests/imgPhoto.test
index 6cfaa4f..d1f64b5 100644
--- a/tests/imgPhoto.test
+++ b/tests/imgPhoto.test
@@ -9,7 +9,7 @@
 #
 # Author: Paul Mackerras (paulus@cs.anu.edu.au)
 #
-# RCS: @(#) $Id: imgPhoto.test,v 1.29 2008/07/22 14:35:23 dgp Exp $
+# RCS: @(#) $Id: imgPhoto.test,v 1.30 2008/07/23 23:24:25 nijtmans Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -118,7 +118,7 @@ update
 
 test imgPhoto-4.1 {ImgPhotoCmd procedure} {
     list [catch {p1} err] $err
-} {1 {wrong # args: should be "p1 option ?arg arg ...?"}}
+} {1 {wrong # args: should be "p1 option ?arg ...?"}}
 test imgPhoto-4.2 {ImgPhotoCmd procedure} {
     list [catch {p1 blah} err] $err
 } {1 {bad option "blah": must be blank, cget, configure, copy, data, get, put, read, redither, transparency, or write}}
@@ -220,7 +220,7 @@ test imgPhoto-4.25 {ImgPhotoCmd procedure: get option} {
 } {1 {wrong # args: should be "p1 get x y"}}
 test imgPhoto-4.26 {ImgPhotoCmd procedure: put option} {
     list [catch {p1 put} err] $err
-} {1 {wrong # args: should be "p1 put data ?options?"}}
+} {1 {wrong # args: should be "p1 put data ?-option value ...?"}}
 test imgPhoto-4.27 {ImgPhotoCmd procedure: put option} {
     list [catch {p1 put {{white} {white white}}} err] $err
 } {1 {all elements of color list must have the same number of elements}}
@@ -233,7 +233,7 @@ test imgPhoto-4.29 {ImgPhotoCmd procedure: put option} {
 } {255 255 255}
 test imgPhoto-4.30 {ImgPhotoCmd procedure: read option} {
     list [catch {p1 read} err] $err
-} {1 {wrong # args: should be "p1 read fileName ?options?"}}
+} {1 {wrong # args: should be "p1 read fileName ?-option value ...?"}}
 test imgPhoto-4.31 {ImgPhotoCmd procedure: read option} hasTeapotPhoto {
     list [catch {p1 read $teapotPhotoFile -zoom 2} err] $err
 } {1 {unrecognized option "-zoom": must be -format, -from, -shrink, or -to}}
@@ -260,7 +260,7 @@ test imgPhoto-4.37 {ImgPhotoCmd procedure: redither option} {
 } {1 {wrong # args: should be "p1 redither"}}
 test imgPhoto-4.38 {ImgPhotoCmd procedure: write option} {
     list [catch {p1 write} err] $err
-} {1 {wrong # args: should be "p1 write fileName ?options?"}}
+} {1 {wrong # args: should be "p1 write fileName ?-option value ...?"}}
 test imgPhoto-4.39 {ImgPhotoCmd procedure: write option} {
     list [catch {p1 write teapot.tmp -format bogus} err] $err
 } {1 {image file format "bogus" is unknown}}
@@ -268,7 +268,7 @@ eval image delete [image names]
 image create photo p1
 test imgPhoto-4.40 {ImgPhotoCmd procedure: transparency option} {
     list [catch {p1 transparency} err] $err
-} {1 {wrong # args: should be "p1 transparency option ?arg arg ...?"}}
+} {1 {wrong # args: should be "p1 transparency option ?arg ...?"}}
 test imgPhoto-4.41 {ImgPhotoCmd procedure: transparency get option} {
     list [catch {p1 transparency get} err] $err
 } {1 {wrong # args: should be "p1 transparency get x y"}}
diff --git a/tests/listbox.test b/tests/listbox.test
index e291735..92c4fda 100644
--- a/tests/listbox.test
+++ b/tests/listbox.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: listbox.test,v 1.29 2008/05/13 13:17:26 patthoyts Exp $
+# RCS: @(#) $Id: listbox.test,v 1.30 2008/07/23 23:24:25 nijtmans Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -115,7 +115,7 @@ foreach test {
 
 test listbox-2.1 {Tk_ListboxCmd procedure} {
     list [catch {listbox} msg] $msg
-} {1 {wrong # args: should be "listbox pathName ?options?"}}
+} {1 {wrong # args: should be "listbox pathName ?-option value ...?"}}
 test listbox-2.2 {Tk_ListboxCmd procedure} {
     list [catch {listbox gorp} msg] $msg
 } {1 {bad window path name "gorp"}}
@@ -142,7 +142,7 @@ pack .l
 update
 test listbox-3.1 {ListboxWidgetCmd procedure} {
     list [catch .l msg] $msg
-} {1 {wrong # args: should be ".l option ?arg arg ...?"}}
+} {1 {wrong # args: should be ".l option ?arg ...?"}}
 test listbox-3.2 {ListboxWidgetCmd procedure, "activate" option} {
     list [catch {.l activate} msg] $msg
 } {1 {wrong # args: should be ".l activate index"}}
@@ -408,7 +408,7 @@ test listbox-3.63 {ListboxWidgetCmd procedure, "index" option} {
 } 34
 test listbox-3.64 {ListboxWidgetCmd procedure, "insert" option} {
     list [catch {.l insert} msg] $msg
-} {1 {wrong # args: should be ".l insert index ?element element ...?"}}
+} {1 {wrong # args: should be ".l insert index ?element ...?"}}
 test listbox-3.65 {ListboxWidgetCmd procedure, "insert" option} {
     list [catch {.l insert badIndex} msg] $msg
 } {1 {bad listbox index "badIndex": must be active, anchor, end, @x,y, or a number}}
@@ -1978,7 +1978,7 @@ test listbox-23.4 {ConfigureListboxItem, wrong num args} {
     .l insert end a
     catch {.l itemco} result
     set result
-} {wrong # args: should be ".l itemconfigure index ?option? ?value? ?option value ...?"}
+} {wrong # args: should be ".l itemconfigure index ?-option? ?value? ?-option value ...?"}
 test listbox-23.5 {ConfigureListboxItem, multiple calls} {
     catch {destroy .l}
     listbox .l
diff --git a/tests/menu.test b/tests/menu.test
index f67fcbe..4a2fccb 100644
--- a/tests/menu.test
+++ b/tests/menu.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: menu.test,v 1.20 2006/12/04 15:16:31 dkf Exp $
+# RCS: @(#) $Id: menu.test,v 1.21 2008/07/23 23:24:23 nijtmans Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -17,7 +17,7 @@ testConstraint hasEarthPhoto [file exists $earthPhotoFile]
 
 test menu-1.1 {Tk_MenuCmd procedure} {
     list [catch menu msg] $msg
-} {1 {wrong # args: should be "menu pathName ?options?"}}
+} {1 {wrong # args: should be "menu pathName ?-option value ...?"}}
 test menu-1.2 {Tk_MenuCmd procedure} {
     list [catch "menu bogus" msg] $msg
 } {1 {bad window path name "bogus"}}
@@ -519,7 +519,7 @@ test menu-3.1 {MenuWidgetCmd procedure} {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1} msg] $msg [destroy .m1]
-} {1 {wrong # args: should be ".m1 option ?arg arg ...?"} {}}
+} {1 {wrong # args: should be ".m1 option ?arg ...?"} {}}
 test menu-3.2 {MenuWidgetCmd, Tcl_Preserve and Tcl_Release} {nonUnixUserInteraction } {
     catch {destroy .m1}
     menu .m1 -postcommand "destroy .m1"
@@ -561,7 +561,7 @@ test menu-3.8 {MenuWidgetCmd procedure, "add" option} {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add} msg] $msg [destroy .m1]
-} {1 {wrong # args: should be ".m1 add type ?options?"} {}}
+} {1 {wrong # args: should be ".m1 add type ?-option value ...?"} {}}
 test menu-3.9 {MenuWidgetCmd procedure, "add" option} {
     catch {destroy .m1}
     menu .m1
@@ -706,7 +706,7 @@ test menu-3.34 {MenuWidgetCmd procedure, "entryconfigure" option} {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 entryconfigure} msg] $msg [destroy .m1]
-} {1 {wrong # args: should be ".m1 entryconfigure index ?option value ...?"} {}}
+} {1 {wrong # args: should be ".m1 entryconfigure index ?-option value ...?"} {}}
 test menu-3.35 {MenuWidgetCmd procedure, "entryconfigure" option} {
     catch {destroy .m1}
     menu .m1
@@ -751,7 +751,7 @@ test menu-3.42 {MenuWidgetCmd procedure, "insert" option} {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 insert} msg] $msg [destroy .m1]
-} {1 {wrong # args: should be ".m1 insert index type ?options?"} {}}
+} {1 {wrong # args: should be ".m1 insert index type ?-option value ...?"} {}}
 test menu-3.43 {MenuWidgetCmd procedure, "insert" option} {
     catch {destroy .m1}
     menu .m1
diff --git a/tests/menubut.test b/tests/menubut.test
index 7f4a210..6613af1 100644
--- a/tests/menubut.test
+++ b/tests/menubut.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: menubut.test,v 1.10 2004/06/24 12:45:43 dkf Exp $
+# RCS: @(#) $Id: menubut.test,v 1.11 2008/07/23 23:24:25 nijtmans Exp $
 
 # XXX This test file is woefully incomplete right now.  If any part
 # XXX of a procedure has tests then the whole procedure has tests,
@@ -88,7 +88,7 @@ foreach test {
 
 test menubutton-2.1 {Tk_MenubuttonCmd procedure} {
     list [catch {menubutton} msg] $msg
-} {1 {wrong # args: should be "menubutton pathName ?options?"}}
+} {1 {wrong # args: should be "menubutton pathName ?-option value ...?"}}
 test menubutton-2.2 {Tk_MenubuttonCmd procedure} {
     list [catch {menubutton foo} msg] $msg
 } {1 {bad window path name "foo"}}
@@ -107,7 +107,7 @@ menubutton .mb -text "Test Menu"
 pack .mb
 test menubutton-3.1 {MenuButtonWidgetCmd procedure} {
     list [catch {.mb} msg] $msg
-} {1 {wrong # args: should be ".mb option ?arg arg ...?"}}
+} {1 {wrong # args: should be ".mb option ?arg ...?"}}
 test menubutton-3.2 {ButtonWidgetCmd procedure, "cget" option} {
     list [catch {.mb c} msg] $msg
 } {1 {ambiguous option "c": must be cget or configure}}
diff --git a/tests/message.test b/tests/message.test
index 40daf6e..c9ad03d 100644
--- a/tests/message.test
+++ b/tests/message.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-2000 by Ajuba Solutions.
 # All rights reserved.
 #
-# RCS: @(#) $Id: message.test,v 1.3 2003/04/01 21:06:46 dgp Exp $
+# RCS: @(#) $Id: message.test,v 1.4 2008/07/23 23:24:25 nijtmans Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -63,7 +63,7 @@ destroy .m
 
 test message-2.1 {Tk_MessageObjCmd procedure} {
     list [catch {message} msg] $msg
-} {1 {wrong # args: should be "message pathName ?options?"}}
+} {1 {wrong # args: should be "message pathName ?-option value ...?"}}
 test message-2.2 {Tk_MessageObjCmd procedure} {
     list [catch {message foo} msg] $msg [winfo child .]
 } {1 {bad window path name "foo"} {}}
@@ -76,7 +76,7 @@ test message-3.1 {MessageWidgetObjCmd procedure} {
     set result [list [catch {.m} msg] $msg]
     destroy .m
     set result
-} {1 {wrong # args: should be ".m option ?arg arg ...?"}}
+} {1 {wrong # args: should be ".m option ?arg ...?"}}
 test message-3.2 {MessageWidgetObjCmd procedure, "cget"} {
     message .m
     set result [list [catch {.m cget} msg] $msg]
diff --git a/tests/scale.test b/tests/scale.test
index ffc4101..5a2a26d 100644
--- a/tests/scale.test
+++ b/tests/scale.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: scale.test,v 1.15 2004/05/23 17:34:49 dkf Exp $
+# RCS: @(#) $Id: scale.test,v 1.16 2008/07/23 23:24:24 nijtmans Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -90,7 +90,7 @@ destroy .s
 
 test scale-2.1 {Tk_ScaleCmd procedure} {
     list [catch {scale} msg] $msg
-} {1 {wrong # args: should be "scale pathName ?options?"}}
+} {1 {wrong # args: should be "scale pathName ?-option value ...?"}}
 test scale-2.2 {Tk_ScaleCmd procedure} {
     list [catch {scale foo} msg] $msg [winfo child .]
 } {1 {bad window path name "foo"} {}}
@@ -103,7 +103,7 @@ pack .s
 update idletasks
 test scale-3.1 {ScaleWidgetCmd procedure} {
     list [catch {.s} msg] $msg
-} {1 {wrong # args: should be ".s option ?arg arg ...?"}}
+} {1 {wrong # args: should be ".s option ?arg ...?"}}
 test scale-3.2 {ScaleWidgetCmd procedure, cget option} {
     list [catch {.s cget} msg] $msg
 } {1 {wrong # args: should be ".s cget option"}}
diff --git a/tests/scrollbar.test b/tests/scrollbar.test
index 9ca586d..5c567c6 100644
--- a/tests/scrollbar.test
+++ b/tests/scrollbar.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: scrollbar.test,v 1.20 2007/12/13 15:27:54 dgp Exp $
+# RCS: @(#) $Id: scrollbar.test,v 1.21 2008/07/23 23:24:26 nijtmans Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -101,7 +101,7 @@ foreach test {
 destroy .s
 test scrollbar-2.1 {Tk_ScrollbarCmd procedure} -returnCodes error -body {
     scrollbar
-} -result {wrong # args: should be "scrollbar pathName ?options?"}
+} -result {wrong # args: should be "scrollbar pathName ?-option value ...?"}
 test scrollbar-2.2 {Tk_ScrollbarCmd procedure} -body {
     scrollbar gorp
 } -returnCodes error -result {bad window path name "gorp"}
@@ -129,7 +129,7 @@ pack .s -side right -fill y
 update
 test scrollbar-3.1 {ScrollbarWidgetCmd procedure} {
     list [catch {.s} msg] $msg
-} {1 {wrong # args: should be ".s option ?arg arg ...?"}}
+} {1 {wrong # args: should be ".s option ?arg ...?"}}
 test scrollbar-3.2 {ScrollbarWidgetCmd procedure, "cget" option} {
     list [catch {.s cget} msg] $msg
 } {1 {wrong # args: should be ".s cget option"}}
diff --git a/tests/select.test b/tests/select.test
index 1c072da..6c29e9f 100644
--- a/tests/select.test
+++ b/tests/select.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: select.test,v 1.16 2005/11/13 21:58:16 dkf Exp $
+# RCS: @(#) $Id: select.test,v 1.17 2008/07/23 23:24:25 nijtmans Exp $
 
 #
 # Note: Multiple display selection handling will only be tested if the
@@ -567,7 +567,7 @@ test select-5.14 {Tk_GetSelection procedure} {unix altDisplay} {
 
 test select-6.1 {Tk_SelectionCmd procedure} {
     list [catch {selection} cmd] $cmd
-} {1 {wrong # args: should be "selection option ?arg arg ...?"}}
+} {1 {wrong # args: should be "selection option ?arg ...?"}}
 # selection clear
 test select-6.2 {Tk_SelectionCmd procedure} {
     list [catch {selection clear -selection} cmd] $cmd
@@ -622,7 +622,7 @@ test select-6.11 {Tk_SelectionCmd procedure} {
 } {.f1 {}}
 test select-6.12 {Tk_SelectionCmd procedure} {
     list [catch {selection clear foo bar} cmd] $cmd
-} {1 {wrong # args: should be "selection clear ?options?"}}
+} {1 {wrong # args: should be "selection clear ?-option value ...?"}}
 # selection get
 test select-6.13 {Tk_SelectionCmd procedure} {
     list [catch {selection get -selection} cmd] $cmd
@@ -666,7 +666,7 @@ test select-6.19 {Tk_SelectionCmd procedure} {
 } {1 {bad window path name ".f2"}}
 test select-6.20 {Tk_SelectionCmd procedure} {
     list [catch {selection get foo bar} cmd] $cmd
-} {1 {wrong # args: should be "selection get ?options?"}}
+} {1 {wrong # args: should be "selection get ?-option value ...?"}}
 test select-6.21 {Tk_SelectionCmd procedure} {
     global selValue selInfo
     setup
@@ -696,13 +696,13 @@ test select-6.25 {Tk_SelectionCmd procedure} {
 } {1 {bad option "-selectionfoo": must be -format, -selection, or -type}}
 test select-6.26 {Tk_SelectionCmd procedure} {
     list [catch {selection handle} cmd] $cmd
-} {1 {wrong # args: should be "selection handle ?options? window command"}}
+} {1 {wrong # args: should be "selection handle ?-option value ...? window command"}}
 test select-6.27 {Tk_SelectionCmd procedure} {
     list [catch {selection handle .} cmd] $cmd
-} {1 {wrong # args: should be "selection handle ?options? window command"}}
+} {1 {wrong # args: should be "selection handle ?-option value ...? window command"}}
 test select-6.28 {Tk_SelectionCmd procedure} {
     list [catch {selection handle . foo bar baz blat} cmd] $cmd
-} {1 {wrong # args: should be "selection handle ?options? window command"}}
+} {1 {wrong # args: should be "selection handle ?-option value ...? window command"}}
 test select-6.29 {Tk_SelectionCmd procedure} {
     catch { destroy .f2 }
     list [catch {selection handle .f2 dummy} cmd] $cmd
@@ -748,7 +748,7 @@ test select-6.37 {Tk_SelectionCmd procedure} {
 } {1 {bad window path name ".f2"}}
 test select-6.38 {Tk_SelectionCmd procedure} {
     list [catch {selection own foo bar baz} cmd] $cmd
-} {1 {wrong # args: should be "selection own ?options? ?window?"}}
+} {1 {wrong # args: should be "selection own ?-option value ...? ?window?"}}
 test select-6.39 {Tk_SelectionCmd procedure} {
     list [catch {selection foo} cmd] $cmd
 } {1 {bad option "foo": must be clear, get, handle, or own}}
diff --git a/tests/send.test b/tests/send.test
index bf1690e..0362474 100644
--- a/tests/send.test
+++ b/tests/send.test
@@ -10,7 +10,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: send.test,v 1.11 2004/06/17 22:38:57 dkf Exp $
+# RCS: @(#) $Id: send.test,v 1.12 2008/07/23 23:24:25 nijtmans Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -232,10 +232,10 @@ test send-8.4 {Tk_SendCmd procedure, options} {secureserver} {
 } {1 {bad option "-gorp": must be -async, -displayof, or --}}
 test send-8.5 {Tk_SendCmd procedure, options} {secureserver} {
     list [catch {send -async foo} msg] $msg
-} {1 {wrong # args: should be "send ?options? interpName arg ?arg ...?"}}
+} {1 {wrong # args: should be "send ?-option value ...? interpName arg ?arg ...?"}}
 test send-8.6 {Tk_SendCmd procedure, options} {secureserver} {
     list [catch {send foo} msg] $msg
-} {1 {wrong # args: should be "send ?options? interpName arg ?arg ...?"}}
+} {1 {wrong # args: should be "send ?-option value ...? interpName arg ?arg ...?"}}
 test send-8.7 {Tk_SendCmd procedure, local execution} {secureserver} {
     set a initial
     send [tk appname] {set a new}
diff --git a/tests/spinbox.test b/tests/spinbox.test
index 6a7cc2a..5393c4f 100644
--- a/tests/spinbox.test
+++ b/tests/spinbox.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: spinbox.test,v 1.10 2008/07/22 11:55:57 aniap Exp $
+# RCS: @(#) $Id: spinbox.test,v 1.11 2008/07/23 23:24:25 nijtmans Exp $
 
 package require tcltest 2.2
 namespace import ::tcltest::*
@@ -988,7 +988,7 @@ test spinbox-1.85 {configuration option: "xscrollcommand"} -setup {
 
 test spinbox-2.1 {Tk_EntryCmd procedure} -body {
     spinbox
-} -returnCodes error -result {wrong # args: should be "spinbox pathName ?options?"}
+} -returnCodes error -result {wrong # args: should be "spinbox pathName ?-option value ...?"}
 test spinbox-2.2 {Tk_EntryCmd procedure} -body {
     spinbox gorp
 } -returnCodes error -result {bad window path name "gorp"}
@@ -1026,7 +1026,7 @@ test spinbox-3.1 {EntryWidgetCmd procedure} -setup {
     .e
 } -cleanup {
     destroy .e
-} -returnCodes error -result {wrong # args: should be ".e option ?arg arg ...?"}
+} -returnCodes error -result {wrong # args: should be ".e option ?arg ...?"}
 test spinbox-3.2 {EntryWidgetCmd procedure, "bbox" widget command} -setup {
     spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
     pack .e
diff --git a/tests/text.test b/tests/text.test
index c195426..8957454 100644
--- a/tests/text.test
+++ b/tests/text.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: text.test,v 1.49 2007/12/13 15:27:54 dgp Exp $
+# RCS: @(#) $Id: text.test,v 1.50 2008/07/23 23:24:25 nijtmans Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -120,7 +120,7 @@ test text-1.[incr i] {text options} {
 
 test text-2.1 {Tk_TextCmd procedure} {
     list [catch {text} msg] $msg
-} {1 {wrong # args: should be "text pathName ?options?"}}
+} {1 {wrong # args: should be "text pathName ?-option value ...?"}}
 test text-2.2 {Tk_TextCmd procedure} {
     list [catch {text foobar} msg] $msg
 } {1 {bad window path name "foobar"}}
@@ -152,7 +152,7 @@ test text-2.6 {Tk_TextCmd procedure} {
 
 test text-3.1 {TextWidgetCmd procedure, basics} {
     list [catch {.t} msg] $msg
-} {1 {wrong # args: should be ".t option ?arg arg ...?"}}
+} {1 {wrong # args: should be ".t option ?arg ...?"}}
 test text-3.2 {TextWidgetCmd procedure} {
     list [catch {.t gorp 1.0 z 1.2} msg] $msg
 } {1 {bad option "gorp": must be bbox, cget, compare, configure, count, debug, delete, dlineinfo, dump, edit, get, image, index, insert, mark, peer, replace, scan, search, see, tag, window, xview, or yview}}
@@ -548,7 +548,7 @@ test text-9.27 {TextWidgetCmd procedure, "get" option} {
 .t mark unset c
 test text-9.2.1 {TextWidgetCmd procedure, "count" option} {
     list [catch {.t count} msg] $msg
-} {1 {wrong # args: should be ".t count ?options? index1 index2"}}
+} {1 {wrong # args: should be ".t count ?-option value ...? index1 index2"}}
 test text-9.2.2.1 {TextWidgetCmd procedure, "count" option} {
     list [catch {.t count blah 1.0 2.0} msg] $msg
 } {1 {bad option "blah" must be -chars, -displaychars, -displayindices, -displaylines, -indices, -lines, -update, -xpixels, or -ypixels}}
@@ -2963,7 +2963,7 @@ test text-24.1 {bug fix - 1642} {
 
 test text-25.1 {TextEditCmd procedure, argument parsing} {
     list [catch {.t edit} msg] $msg
-} {1 {wrong # args: should be ".t edit option ?arg arg ...?"}}
+} {1 {wrong # args: should be ".t edit option ?arg ...?"}}
 test text-25.2 {TextEditCmd procedure, argument parsing} {
     list [catch {.t edit gorp} msg] $msg
 } {1 {bad edit option "gorp": must be modified, redo, reset, separator, or undo}}
diff --git a/tests/textImage.test b/tests/textImage.test
index 8ef5033..d78472a 100644
--- a/tests/textImage.test
+++ b/tests/textImage.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: textImage.test,v 1.10 2004/09/10 12:13:43 vincentdarley Exp $
+# RCS: @(#) $Id: textImage.test,v 1.11 2008/07/23 23:24:25 nijtmans Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -25,7 +25,7 @@ test textImage-1.1 {basic argument checking} {
 	text .t -font test_font -bd 0 -highlightthickness 0 -padx 0 -pady 0
 	pack .t
 	list [catch {.t image} msg] $msg
-} {1 {wrong # args: should be ".t image option ?arg arg ...?"}}
+} {1 {wrong # args: should be ".t image option ?arg ...?"}}
 
 test textImage-1.2 {basic argument checking} {
 	catch {destroy .t}
@@ -60,7 +60,7 @@ test textImage-1.6 {configure argument checking} {
 	text .t -font test_font -bd 0 -highlightthickness 0 -padx 0 -pady 0
 	pack .t
 	list [catch {.t image configure } msg] $msg
-} {1 {wrong # args: should be ".t image configure index ?option value ...?"}}
+} {1 {wrong # args: should be ".t image configure index ?-option value ...?"}}
 
 test textImage-1.7 {configure argument checking} {
 	catch {destroy .t}
@@ -81,7 +81,7 @@ test textImage-1.9 {create argument checking} {
 	text .t -font test_font -bd 0 -highlightthickness 0 -padx 0 -pady 0
 	pack .t
 	list [catch {.t image create} msg] $msg
-} {1 {wrong # args: should be ".t image create index ?option value ...?"}}
+} {1 {wrong # args: should be ".t image create index ?-option value ...?"}}
 
 test textImage-1.10 {create argument checking} {
 	catch {destroy .t}
diff --git a/tests/textMark.test b/tests/textMark.test
index 4cd3ea2..d08b037 100644
--- a/tests/textMark.test
+++ b/tests/textMark.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: textMark.test,v 1.9 2004/06/17 22:38:57 dkf Exp $
+# RCS: @(#) $Id: textMark.test,v 1.10 2008/07/23 23:24:24 nijtmans Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -41,7 +41,7 @@ Line 7"
 
 test textMark-1.1 {TkTextMarkCmd - missing option} haveCourier12 {
     list [catch {.t mark} msg] $msg
-} {1 {wrong # args: should be ".t mark option ?arg arg ...?"}}
+} {1 {wrong # args: should be ".t mark option ?arg ...?"}}
 test textMark-1.2 {TkTextMarkCmd - bogus option} haveCourier12 {
     list [catch {.t mark gorp} msg] $msg
 } {1 {bad mark option "gorp": must be gravity, names, next, previous, set, or unset}}
@@ -125,7 +125,7 @@ test textMark-4.3 {TkTextMarkCmd - "unset" option} haveCourier12 {
 
 test textMark-5.1 {TkTextMarkCmd - miscellaneous} haveCourier12 {
     list [catch {.t mark} msg] $msg
-} {1 {wrong # args: should be ".t mark option ?arg arg ...?"}}
+} {1 {wrong # args: should be ".t mark option ?arg ...?"}}
 test textMark-5.2 {TkTextMarkCmd - miscellaneous} haveCourier12 {
     list [catch {.t mark foo} msg] $msg
 } {1 {bad mark option "foo": must be gravity, names, next, previous, set, or unset}}
diff --git a/tests/textTag.test b/tests/textTag.test
index ac5101a..fa950fc 100644
--- a/tests/textTag.test
+++ b/tests/textTag.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: textTag.test,v 1.12 2004/12/04 00:04:42 dkf Exp $
+# RCS: @(#) $Id: textTag.test,v 1.13 2008/07/23 23:24:26 nijtmans Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -99,7 +99,7 @@ foreach test {
 }
 test textTag-2.1 {TkTextTagCmd - "add" option} haveCourier12 {
     list [catch {.t tag} msg] $msg
-} {1 {wrong # args: should be ".t tag option ?arg arg ...?"}}
+} {1 {wrong # args: should be ".t tag option ?arg ...?"}}
 test textTag-2.2 {TkTextTagCmd - "add" option} haveCourier12 {
     list [catch {.t tag gorp} msg] $msg
 } {1 {bad tag option "gorp": must be add, bind, cget, configure, delete, lower, names, nextrange, prevrange, raise, ranges, or remove}}
@@ -213,7 +213,7 @@ test textTag-4.5 {TkTextTagCmd - "cget" option} haveCourier12 {
 
 test textTag-5.1 {TkTextTagCmd - "configure" option} haveCourier12 {
     list [catch {.t tag configure} msg] $msg
-} {1 {wrong # args: should be ".t tag configure tagName ?option? ?value? ?option value ...?"}}
+} {1 {wrong # args: should be ".t tag configure tagName ?-option? ?value? ?-option value ...?"}}
 test textTag-5.2 {TkTextTagCmd - "configure" option} haveCourier12 {
     list [catch {.t tag configure x -foo} msg] $msg
 } {1 {unknown option "-foo"}}
diff --git a/tests/textWind.test b/tests/textWind.test
index b6739c2..a0a0858 100644
--- a/tests/textWind.test
+++ b/tests/textWind.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: textWind.test,v 1.22 2006/10/17 10:21:50 patthoyts Exp $
+# RCS: @(#) $Id: textWind.test,v 1.23 2008/07/23 23:24:25 nijtmans Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -108,7 +108,7 @@ frame .f -width 10 -height 6 -bg $color
 .t window create 1.3 -window .f -padx 1 -pady 2
 test textWind-2.1 {TkTextWindowCmd procedure} {
     list [catch {.t window} msg] $msg
-} {1 {wrong # args: should be ".t window option ?arg arg ...?"}}
+} {1 {wrong # args: should be ".t window option ?arg ...?"}}
 test textWind-2.2 {TkTextWindowCmd procedure, "cget" option} {
     list [catch {.t window cget} msg] $msg
 } {1 {wrong # args: should be ".t window cget index option"}}
@@ -129,7 +129,7 @@ test textWind-2.7 {TkTextWindowCmd procedure, "cget" option} {
 } {0 2}
 test textWind-2.8 {TkTextWindowCmd procedure} {
     list [catch {.t window co} msg] $msg
-} {1 {wrong # args: should be ".t window configure index ?option value ...?"}}
+} {1 {wrong # args: should be ".t window configure index ?-option value ...?"}}
 test textWind-2.9 {TkTextWindowCmd procedure} {
     list [catch {.t window configure gorp} msg] $msg
 } {1 {bad text index "gorp"}}
@@ -167,7 +167,7 @@ test textWind-2.13 {TkTextWindowCmd procedure} {
 } {{} {-padx {} {} 0 14} {-pady {} {} 0 15}}
 test textWind-2.14 {TkTextWindowCmd procedure} {
     list [catch {.t window create} msg] $msg
-} {1 {wrong # args: should be ".t window create index ?option value ...?"}}
+} {1 {wrong # args: should be ".t window create index ?-option value ...?"}}
 test textWind-2.15 {TkTextWindowCmd procedure} {
     list [catch {.t window create gorp} msg] $msg
 } {1 {bad text index "gorp"}}
diff --git a/tests/ttk/ttk.test b/tests/ttk/ttk.test
index a1430ff..315aea2 100644
--- a/tests/ttk/ttk.test
+++ b/tests/ttk/ttk.test
@@ -598,10 +598,10 @@ test ttk-14.3 "-textvariable in nonexistant namespace" -body {
 
 test ttk-15.1 "style element create: insufficient args" -body {
      ttk::style element create
-} -returnCodes 1 -result "wrong # args: should be \"ttk::style element create name type ?options...?\""
+} -returnCodes 1 -result "wrong # args: should be \"ttk::style element create name type ?-option value ...?\""
 test ttk-15.2 "style element create: insufficient args" -body {
      ttk::style element create plain.background
-} -returnCodes 1 -result "wrong # args: should be \"ttk::style element create name type ?options...?\""
+} -returnCodes 1 -result "wrong # args: should be \"ttk::style element create name type ?-option value ...?\""
 test ttk-15.3 "style element create: insufficient args" -body {
      ttk::style element create plain.background from
 } -returnCodes 1 -result "wrong # args: should be \"theme ?element?\""
diff --git a/tests/unixWm.test b/tests/unixWm.test
index b7e78dc..2c7a781 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: unixWm.test,v 1.44 2007/12/13 15:27:55 dgp Exp $
+# RCS: @(#) $Id: unixWm.test,v 1.45 2008/07/23 23:24:25 nijtmans Exp $
 
 package require tcltest 2.2
 eval tcltest::configure $argv
@@ -2475,7 +2475,7 @@ test unixWm-60.5 {wm attributes - bad attribute} -constraints unix -body {
 
 test unixWm-61.1 {Tk_WmCmd procedure, "iconphoto" option} unix {
     list [catch {wm iconph .} msg] $msg
-} {1 {wrong # args: should be "wm iconphoto window ?-default? image1 ?image2 ...?"}}
+} {1 {wrong # args: should be "wm iconphoto window ?-default? image ?image ...?"}}
 test unixWm-61.2 {Tk_WmCmd procedure, "iconphoto" option} unix {
     destroy .t
     toplevel .t
diff --git a/tests/winSend.test b/tests/winSend.test
index 721dd8a..ee3990d 100644
--- a/tests/winSend.test
+++ b/tests/winSend.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: winSend.test,v 1.7 2004/12/04 00:04:43 dkf Exp $
+# RCS: @(#) $Id: winSend.test,v 1.8 2008/07/23 23:24:24 nijtmans Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -98,7 +98,7 @@ test winSend-1.6 {Tk_SetAppName - safe interps} winSend {
 
 test winSend-2.1 {Tk_SendObjCmd - # of args} winSend {
     list [catch {send tktest} msg] $msg
-} {1 {wrong # args: should be "send ?options? interpName arg ?arg ...?"}}
+} {1 {wrong # args: should be "send ?-option value ...? interpName arg ?arg ...?"}}
 test winSend-2.1a {Tk_SendObjCmd: arguments} winSend {
     list [catch {send -bogus tktest} msg] $msg
 } {1 {bad option "-bogus": must be -async, -displayof, or --}}
diff --git a/tests/winWm.test b/tests/winWm.test
index 0b5592a..13ab984 100644
--- a/tests/winWm.test
+++ b/tests/winWm.test
@@ -9,7 +9,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: winWm.test,v 1.18 2006/12/01 19:48:00 hobbs Exp $
+# RCS: @(#) $Id: winWm.test,v 1.19 2008/07/23 23:24:24 nijtmans Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -359,7 +359,7 @@ test winWm-7.4 {UpdateWrapper must maintain focus} win {
 
 test winWm-8.1 {Tk_WmCmd procedure, "iconphoto" option} win {
     list [catch {wm iconph .} msg] $msg
-} {1 {wrong # args: should be "wm iconphoto window ?-default? image1 ?image2 ...?"}}
+} {1 {wrong # args: should be "wm iconphoto window ?-default? image ?image ...?"}}
 test winWm-8.2 {Tk_WmCmd procedure, "iconphoto" option} win {
     destroy .t
     toplevel .t
diff --git a/tests/wm.test b/tests/wm.test
index a5586bd..f797a43 100644
--- a/tests/wm.test
+++ b/tests/wm.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: wm.test,v 1.39 2008/03/20 13:23:20 dkf Exp $
+# RCS: @(#) $Id: wm.test,v 1.40 2008/07/23 23:24:25 nijtmans Exp $
 
 # This file tests window manager interactions that work across platforms.
 # Window manager tests that only work on a specific platform should be placed
@@ -867,14 +867,14 @@ test wm-iconphoto-1.1 {usage} -returnCodes error -body {
 } -result {wrong # args: should be "wm option window ?arg ...?"}
 test wm-iconphoto-1.2 {usage} -returnCodes error -body {
     wm iconphoto .
-} -result {wrong # args: should be "wm iconphoto window ?-default? image1 ?image2 ...?"}
+} -result {wrong # args: should be "wm iconphoto window ?-default? image ?image ...?"}
 test wm-iconphoto-1.3 {usage} -returnCodes error -body {
     wm iconphoto . notanimage
 } -result {can't use "notanimage" as iconphoto: not a photo image}
 test wm-iconphoto-1.4 {usage} -returnCodes error -body {
     # we currently have no return info
     wm iconphoto . -default
-} -result {wrong # args: should be "wm iconphoto window ?-default? image1 ?image2 ...?"}
+} -result {wrong # args: should be "wm iconphoto window ?-default? image ?image ...?"}
 
 # All other iconphoto tests are platform specific