Merge trunk

1 files changed, 13 insertions, 13 deletions

diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index c7ecb76..0357471 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -138,7 +138,7 @@ Tcl_PutsObjCmd(
 	/* Fall through */
     default:			/* [puts] or
 				 * [puts some bad number of arguments...] */
-	Tcl_WrongNumArgs(interp, 1, objv, "?-nonewline? ?channelId? string");
+	Tcl_WrongNumArgs(interp, 1, objv, "?-nonewline? ?channel? string");
 	return TCL_ERROR;
     }
 
@@ -222,7 +222,7 @@ Tcl_FlushObjCmd(
     int mode;
 
     if (objc != 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "channelId");
+	Tcl_WrongNumArgs(interp, 1, objv, "channel");
 	return TCL_ERROR;
     }
     chanObjPtr = objv[1];
@@ -288,7 +288,7 @@ Tcl_GetsObjCmd(
     int code = TCL_OK;
 
     if ((objc != 2) && (objc != 3)) {
-	Tcl_WrongNumArgs(interp, 1, objv, "channelId ?varName?");
+	Tcl_WrongNumArgs(interp, 1, objv, "channel ?varName?");
 	return TCL_ERROR;
     }
     chanObjPtr = objv[1];
@@ -379,7 +379,7 @@ Tcl_ReadObjCmd(
 
     argerror:
 	iPtr = (Interp *) interp;
-	Tcl_WrongNumArgs(interp, 1, objv, "channelId ?numChars?");
+	Tcl_WrongNumArgs(interp, 1, objv, "channel ?numChars?");
 
 	/*
 	 * Do not append directly; that makes ensembles using this command as
@@ -387,7 +387,7 @@ Tcl_ReadObjCmd(
 	 */
 
 	iPtr->flags |= INTERP_ALTERNATE_WRONG_ARGS;
-	Tcl_WrongNumArgs(interp, 1, objv, "?-nonewline? channelId");
+	Tcl_WrongNumArgs(interp, 1, objv, "?-nonewline? channel");
 	return TCL_ERROR;
     }
 
@@ -515,7 +515,7 @@ Tcl_SeekObjCmd(
     static const int modeArray[] = {SEEK_SET, SEEK_CUR, SEEK_END};
 
     if ((objc != 3) && (objc != 4)) {
-	Tcl_WrongNumArgs(interp, 1, objv, "channelId offset ?origin?");
+	Tcl_WrongNumArgs(interp, 1, objv, "channel offset ?origin?");
 	return TCL_ERROR;
     }
     if (TclGetChannelFromObj(interp, objv[1], &chan, NULL, 0) != TCL_OK) {
@@ -584,7 +584,7 @@ Tcl_TellObjCmd(
     int code;
 
     if (objc != 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "channelId");
+	Tcl_WrongNumArgs(interp, 1, objv, "channel");
 	return TCL_ERROR;
     }
 
@@ -647,7 +647,7 @@ Tcl_CloseObjCmd(
     static const int dirArray[] = {TCL_CLOSE_READ, TCL_CLOSE_WRITE};
 
     if ((objc != 2) && (objc != 3)) {
-	Tcl_WrongNumArgs(interp, 1, objv, "channelId ?direction?");
+	Tcl_WrongNumArgs(interp, 1, objv, "channel ?direction?");
 	return TCL_ERROR;
     }
 
@@ -753,7 +753,7 @@ Tcl_FconfigureObjCmd(
     int i;			/* Iterate over arg-value pairs. */
 
     if ((objc < 2) || (((objc % 2) == 1) && (objc != 3))) {
-	Tcl_WrongNumArgs(interp, 1, objv, "channelId ?-option value ...?");
+	Tcl_WrongNumArgs(interp, 1, objv, "channel ?-option value ...?");
 	return TCL_ERROR;
     }
 
@@ -826,7 +826,7 @@ Tcl_EofObjCmd(
     Tcl_Channel chan;
 
     if (objc != 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "channelId");
+	Tcl_WrongNumArgs(interp, 1, objv, "channel");
 	return TCL_ERROR;
     }
 
@@ -1038,7 +1038,7 @@ Tcl_FblockedObjCmd(
     int mode;
 
     if (objc != 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "channelId");
+	Tcl_WrongNumArgs(interp, 1, objv, "channel");
 	return TCL_ERROR;
     }
 
@@ -1808,7 +1808,7 @@ ChanPendingObjCmd(
     int mode;
 
     if (objc != 3) {
-	Tcl_WrongNumArgs(interp, 1, objv, "mode channelId");
+	Tcl_WrongNumArgs(interp, 1, objv, "mode channel");
 	return TCL_ERROR;
     }
 
@@ -1868,7 +1868,7 @@ ChanTruncateObjCmd(
     Tcl_WideInt length;
 
     if ((objc < 2) || (objc > 3)) {
-	Tcl_WrongNumArgs(interp, 1, objv, "channelId ?length?");
+	Tcl_WrongNumArgs(interp, 1, objv, "channel ?length?");
 	return TCL_ERROR;
     }
     if (TclGetChannelFromObj(interp, objv[1], &chan, NULL, 0) != TCL_OK) {