* doc/wm.n:

	* mac/tkMacWm.c:
	* tests/wm.test:
	* unix/tkUnixWm.c:
	* win/tkWinWm.c: Update wm stackorder usage message
	to make it clear that either 1 or 3 arguments are
	required. [Bug 540013]

6 files changed, 21 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index d9d4c9a..59f5166 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-04-10  Mo DeJong  <mdejong@users.sourceforge.net>
+
+	* doc/wm.n:
+	* mac/tkMacWm.c:
+	* tests/wm.test:
+	* unix/tkUnixWm.c:
+	* win/tkWinWm.c: Update wm stackorder usage message
+	to make it clear that either 1 or 3 arguments are
+	required. [Bug 540013]
+
 2002-04-08  Daniel Steffen  <das@users.sourceforge.net>
 
 	* mac/tkMacProjects.sea.hqx: added tkPanedWindow.c to projects
diff --git a/doc/wm.n b/doc/wm.n
index d258996..d1a5af5 100644
--- a/doc/wm.n
+++ b/doc/wm.n
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: wm.n,v 1.7 2001/12/04 03:07:43 mdejong Exp $
+'\" RCS: @(#) $Id: wm.n,v 1.8 2002/04/10 19:39:01 mdejong Exp $
 '\" 
 .so man.macros
 .TH wm n 4.3 Tk "Tk Built-In Commands"
@@ -400,7 +400,7 @@ source of the window's current size, or an empty string if
 no source has been specified yet.  Most window managers interpret
 ``no source'' as equivalent to \fBprogram\fR.
 .TP
-\fBwm stackorder \fIwindow\fR ?\fIisabove|isbelow\fR? \fI?window?\fR
+\fBwm stackorder \fIwindow\fR ?\fIisabove|isbelow window\fR?
 The stackorder command returns a list of toplevel windows
 in stacking order, from lowest to highest. When a single toplevel
 window is passed, the returned list recursively includes all of the
diff --git a/mac/tkMacWm.c b/mac/tkMacWm.c
index 6a7e8c0..8e1e677 100644
--- a/mac/tkMacWm.c
+++ b/mac/tkMacWm.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMacWm.c,v 1.14 2002/01/25 21:09:37 dgp Exp $
+ * RCS: @(#) $Id: tkMacWm.c,v 1.15 2002/04/10 19:39:01 mdejong Exp $
  */
 
 #include <Gestalt.h>
@@ -1559,7 +1559,7 @@ Tk_WmCmd(
 	if ((argc != 3) && (argc != 5)) {
 	    Tcl_AppendResult(interp, "wrong # arguments: must be \"",
 		    argv[0],
-		    " stackorder window ?isabove|isbelow? ?window?\"",
+		    " stackorder window ?isabove|isbelow window?\"",
 		    (char *) NULL);
 	    return TCL_ERROR;
 	}
diff --git a/tests/wm.test b/tests/wm.test
index 0dfd5df..3b611ef 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.2 2002/01/19 00:36:02 mdejong Exp $
+# RCS: @(#) $Id: wm.test,v 1.3 2002/04/10 19:39:01 mdejong Exp $
 
 # This file tests window manager interactions that work across
 # platforms. Window manager tests that only work on a specific
@@ -34,11 +34,11 @@ test wm-stackorder-1.1 {usage} {
 
 test wm-stackorder-1.2 {usage} {
     list [catch {wm stackorder . _} err] $err
-} {1 {wrong # arguments: must be "wm stackorder window ?isabove|isbelow? ?window?"}}
+} {1 {wrong # arguments: must be "wm stackorder window ?isabove|isbelow window?"}}
 
 test wm-stackorder-1.3 {usage} {
     list [catch {wm stackorder . _ _ _} err] $err
-} {1 {wrong # arguments: must be "wm stackorder window ?isabove|isbelow? ?window?"}}
+} {1 {wrong # arguments: must be "wm stackorder window ?isabove|isbelow window?"}}
 
 test wm-stackorder-1.4 {usage} {
     list [catch {wm stackorder . is .} err] $err
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c
index 940cf61..b268bee 100644
--- a/unix/tkUnixWm.c
+++ b/unix/tkUnixWm.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkUnixWm.c,v 1.13 2002/04/05 08:41:44 hobbs Exp $
+ * RCS: @(#) $Id: tkUnixWm.c,v 1.14 2002/04/10 19:39:01 mdejong Exp $
  */
 
 #include "tkPort.h"
@@ -1759,7 +1759,7 @@ Tk_WmCmd(clientData, interp, argc, argv)
 	if ((argc != 3) && (argc != 5)) {
 	    Tcl_AppendResult(interp, "wrong # arguments: must be \"",
 		    argv[0],
-		    " stackorder window ?isabove|isbelow? ?window?\"",
+		    " stackorder window ?isabove|isbelow window?\"",
 		    (char *) NULL);
 	    return TCL_ERROR;
 	}
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index e68e177..fe149eb 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWinWm.c,v 1.34 2002/01/25 21:09:37 dgp Exp $
+ * RCS: @(#) $Id: tkWinWm.c,v 1.35 2002/04/10 19:39:01 mdejong Exp $
  */
 
 #include "tkWinInt.h"
@@ -3073,7 +3073,7 @@ Tk_WmCmd(clientData, interp, argc, argv)
 	if ((argc != 3) && (argc != 5)) {
 	    Tcl_AppendResult(interp, "wrong # arguments: must be \"",
 		    argv[0],
-		    " stackorder window ?isabove|isbelow? ?window?\"",
+		    " stackorder window ?isabove|isbelow window?\"",
 		    (char *) NULL);
 	    return TCL_ERROR;
 	}