Update documentation, and final tweaks for TIP #581

10 files changed, 19 insertions, 25 deletions

diff --git a/doc/grid.n b/doc/grid.n
index f4819e7..4fff2a8 100644
--- a/doc/grid.n
+++ b/doc/grid.n
@@ -301,7 +301,7 @@ The size is determined either by the \fIcontent\fR occupying the largest
 row or column, or the largest column or row with a \fB\-minsize\fR,
 \fB\-weight\fR, or \fB\-pad\fR that is non-zero.
 .TP
-\fBgrid slaves fI\window\fR ?\fI\-option value\fR?
+\fBgrid content fI\window\fR ?\fI\-option value\fR?
 .
 If no options are supplied, a list of all of the content in \window\fR
 is returned, most recently managed first.
@@ -309,11 +309,9 @@ is returned, most recently managed first.
 causes only the content in the row (or column) specified by \fIvalue\fR
 to be returned.
 .TP
-.VS "TIP 581"
-\fBgrid content \fIwindow\fR ?\fI\-option value\fR?
+\fBgrid slaves \fIwindow\fR ?\fI\-option value\fR?
 .
-Synonym for . \fBgrid slaves \fIwindow\fR ?\fI\-option value\fR?
-.VE "TIP 581"
+Synonym for . \fBgrid content \fIwindow\fR ?\fI\-option value\fR?
 .SH "RELATIVE PLACEMENT"
 .PP
 The \fBgrid\fR command contains a limited set of capabilities that
diff --git a/doc/pack.n b/doc/pack.n
index a568001..da09a6d 100644
--- a/doc/pack.n
+++ b/doc/pack.n
@@ -158,17 +158,15 @@ If \fIboolean\fR is omitted then the command returns \fB0\fR or
 for \fIcontainer\fR.
 Propagation is enabled by default.
 .TP
-\fBpack slaves \fIwindow\fR
+\fBpack content \fIwindow\fR
 Returns a list of all of the content windows in the packing order for \fIwindow\fR.
 The order of the content windows in the list is the same as their order in
 the packing order.
 If \fIwindow\fR has no content then an empty string is returned.
 .TP
-.VS "TIP 581"
-\fBpack content \fIwindow\fR
+\fBpack slaves \fIwindow\fR
 .
-Synonym for . \fBpack slaves \fIwindow\fR
-.VE "TIP 581"
+Synonym for . \fBpack content \fIwindow\fR
 .SH "THE PACKER ALGORITHM"
 .PP
 For each container the packer maintains an ordered list of content
diff --git a/doc/place.n b/doc/place.n
index f52ec53..d887ee7 100644
--- a/doc/place.n
+++ b/doc/place.n
@@ -191,15 +191,13 @@ The list consists of \fIoption\-value\fR pairs in exactly the
 same form as might be specified to the \fBplace configure\fR
 command.
 .TP
-\fBplace slaves \fIwindow\fR
+\fBplace content \fIwindow\fR
 Returns a list of all the content windows for which \fIwindow\fR is the container.
 If there is no content for \fIwindow\fR then an empty string is returned.
 .TP
-.VS "TIP 581"
-\fBplace content \fIwindow\fR
+\fBplace slaves \fIwindow\fR
 .
-Synonym for . \fBplace slaves \fIwindow\fR
-.VE "TIP 581"
+Synonym for . \fBplace content \fIwindow\fR
 .PP
 If the configuration of a window has been retrieved with
 \fBplace info\fR, that configuration can be restored later by
diff --git a/generic/tkGrid.c b/generic/tkGrid.c
index 00a8546..067407a 100644
--- a/generic/tkGrid.c
+++ b/generic/tkGrid.c
@@ -384,8 +384,8 @@ Tk_GridObjCmd(
 	return GridPropagateCommand(tkwin, interp, objc, objv);
     case GRID_SIZE:
 	return GridSizeCommand(tkwin, interp, objc, objv);
-    case GRID_CONTENT:
     case GRID_SLAVES:
+    case GRID_CONTENT:
 	return GridContentCommand(tkwin, interp, objc, objv);
 
     /*
diff --git a/generic/tkPack.c b/generic/tkPack.c
index 65a2512..d73de4a 100644
--- a/generic/tkPack.c
+++ b/generic/tkPack.c
@@ -445,8 +445,8 @@ Tk_PackObjCmd(
 	}
 	break;
     }
-    case PACK_CONTENT:
-    case PACK_SLAVES: {
+    case PACK_SLAVES:
+    case PACK_CONTENT: {
 	Tk_Window container;
 	Packer *containerPtr, *contentPtr;
 	Tcl_Obj *resultObj;
diff --git a/generic/tkPlace.c b/generic/tkPlace.c
index fdfc3e4..01386a2 100644
--- a/generic/tkPlace.c
+++ b/generic/tkPlace.c
@@ -330,8 +330,8 @@ Tk_PlaceObjCmd(
 	}
 	return PlaceInfoCommand(interp, tkwin);
 
-    case PLACE_CONTENT:
-    case PLACE_SLAVES: {
+    case PLACE_SLAVES:
+    case PLACE_CONTENT: {
 	Container *containerPtr;
 
 	if (objc != 3) {
diff --git a/tests/grid.test b/tests/grid.test
index 916014d..7f66e0d 100644
--- a/tests/grid.test
+++ b/tests/grid.test
@@ -45,7 +45,7 @@ test grid-1.1 {basic argument checking} -body {
 } -returnCodes error -result {wrong # args: should be "grid option arg ?arg ...?"}
 test grid-1.2 {basic argument checking} -body {
     grid foo bar
-} -returnCodes error -result {bad option "foo": must be anchor, bbox, columnconfigure, configure, content, forget, info, location, propagate, remove, rowconfigure, size, or slaves}
+} -returnCodes error -match glob -result {bad option "foo": must be anchor, bbox, columnconfigure, configure, content, forget, info, location, propagate, remove, rowconfigure, *size*}
 test grid-1.3 {basic argument checking} -body {
     button .b
     grid .b -row 0 -column
diff --git a/tests/oldpack.test b/tests/oldpack.test
index 9b67628..46b3111 100644
--- a/tests/oldpack.test
+++ b/tests/oldpack.test
@@ -452,10 +452,10 @@ test oldpack-8.2 {syntax errors} -body {
 } -returnCodes error -result {wrong # args: should be "pack option arg ?arg ...?"}
 test oldpack-8.3 {syntax errors} -body {
     pack gorp foo
-} -returnCodes error -result {bad option "gorp": must be configure, content, forget, info, propagate, or slaves}
+} -returnCodes error -match glob -result {bad option "gorp": must be configure, content, forget, info, *propagate*}
 test oldpack-8.4 {syntax errors} -body {
     pack a .pack
-} -returnCodes error -result {bad option "a": must be configure, content, forget, info, propagate, or slaves}
+} -returnCodes error -match glob -result {bad option "a": must be configure, content, forget, info, *propagate*}
 test oldpack-8.5 {syntax errors} -body {
     pack after foobar
 } -returnCodes error -result {bad window path name "foobar"}
diff --git a/tests/pack.test b/tests/pack.test
index 2221b05..5c919ed 100644
--- a/tests/pack.test
+++ b/tests/pack.test
@@ -1360,7 +1360,7 @@ test pack-12.46 {command options and errors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack lousy .pack
-} -returnCodes error -result {bad option "lousy": must be configure, content, forget, info, propagate, or slaves}
+} -returnCodes error -match glob -result {bad option "lousy": must be configure, content, forget, info, *propagate*}
 
 test pack-13.1 {window deletion} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d .pack.right .pack.bottom
diff --git a/tests/place.test b/tests/place.test
index 0a59d13..e811b1a 100644
--- a/tests/place.test
+++ b/tests/place.test
@@ -329,7 +329,7 @@ test place-9.5 {PlaceObjCmd} -setup {
     place badopt .foo
 } -cleanup {
     destroy .foo
-} -returnCodes error -result {bad option "badopt": must be configure, content, forget, info, or slaves}
+} -returnCodes error -match glob -result {bad option "badopt": must be configure, content, forget, *info*}
 test place-9.6 {PlaceObjCmd, configure errors} -setup {
     destroy .foo
 } -body {