Merge trunk

12 files changed, 27 insertions, 27 deletions

diff --git a/unix/install-sh b/unix/install-sh
index 21b733a..b6593f3 100755
--- a/unix/install-sh
+++ b/unix/install-sh
@@ -329,7 +329,7 @@ do
 	' 0
 
 	# Because "mkdir -p" follows existing symlinks and we likely work
-	# directly in world-writeable /tmp, make sure that the '$tmpdir'
+	# directly in world-writable /tmp, make sure that the '$tmpdir'
 	# directory is successfully created first before we actually test
 	# 'mkdir -p'.
 	if (umask $mkdir_umask &&
@@ -515,4 +515,4 @@ done
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
-# End:
\ No newline at end of file
+# End:
diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c
index af444f5..6feaeae 100644
--- a/unix/tclUnixChan.c
+++ b/unix/tclUnixChan.c
@@ -1464,7 +1464,7 @@ TtyParseMode(
      *
      * We cannot if/else/endif the strchr arguments, it has to be the whole
      * function. On AIX this function is apparently a macro, and macros do
-     * not allow pre-processor directives in their arguments.
+     * not allow preprocessor directives in their arguments.
      */
 
     if (
@@ -1714,7 +1714,7 @@ TclpOpenFileChannel(
 Tcl_Channel
 Tcl_MakeFileChannel(
     void *handle,		/* OS level handle. */
-    int mode)			/* ORed combination of TCL_READABLE and
+    int mode)			/* OR'ed combination of TCL_READABLE and
 				 * TCL_WRITABLE to indicate file mode. */
 {
     TtyState *fsPtr;
diff --git a/unix/tclUnixCompat.c b/unix/tclUnixCompat.c
index 8aff976..30ddb71 100644
--- a/unix/tclUnixCompat.c
+++ b/unix/tclUnixCompat.c
@@ -734,7 +734,7 @@ CopyGrp(
  *
  * CopyHostent --
  *
- *      Copies string fields of the hostnent structure to the private buffer,
+ *      Copies string fields of the hostent structure to the private buffer,
  *      honouring the size of the buffer.
  *
  * Results:
diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c
index 10292f0..8109202 100644
--- a/unix/tclUnixFCmd.c
+++ b/unix/tclUnixFCmd.c
@@ -1,7 +1,7 @@
 /*
  * tclUnixFCmd.c
  *
- *	This file implements the unix specific portion of file manipulation
+ *	This file implements the Unix specific portion of file manipulation
  *	subcommands of the "file" command. All filename arguments should
  *	already be translated to native format.
  *
@@ -343,7 +343,7 @@ DoRenameFile(
     }
 
     /*
-     * IRIX returns EIO when you attept to move a directory into itself. We
+     * IRIX returns EIO when you attempt to move a directory into itself. We
      * just map EIO to EINVAL get the right message on SGI. Most platforms
      * don't return EIO except in really strange cases.
      */
@@ -733,7 +733,7 @@ DoCreateDirectory(
  *
  *	Recursively copies a directory. The target directory dst must not
  *	already exist. Note that this function does not merge two directory
- *	hierarchies, even if the target directory is an an empty directory.
+ *	hierarchies, even if the target directory is an empty directory.
  *
  * Results:
  *	If the directory was successfully copied, returns TCL_OK. Otherwise
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c
index b21de07..50ee64d 100644
--- a/unix/tclUnixFile.c
+++ b/unix/tclUnixFile.c
@@ -700,7 +700,7 @@ TclpObjLstat(
  *	is either the given clientData, if the working directory hasn't
  *	changed, or a new clientData (owned by our caller), giving the new
  *	native path, or NULL if the current directory could not be determined.
- *	If NULL is returned, the caller can examine the standard posix error
+ *	If NULL is returned, the caller can examine the standard Posix error
  *	codes to determine the cause of the problem.
  *
  * Side effects:
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c
index ed9058e..9d1c192 100644
--- a/unix/tclUnixInit.c
+++ b/unix/tclUnixInit.c
@@ -469,7 +469,7 @@ TclpInitLibraryPath(
      * Look for the library relative to the TCL_LIBRARY env variable. If the
      * last dirname in the TCL_LIBRARY path does not match the last dirname in
      * the installLib variable, use the last dir name of installLib in
-     * addition to the orginal TCL_LIBRARY path.
+     * addition to the original TCL_LIBRARY path.
      */
 
     str = getenv("TCL_LIBRARY");			/* INTL: Native. */
@@ -998,7 +998,7 @@ TclpSetVariables(
  * TclpFindVariable --
  *
  *	Locate the entry in environ for a given name. On Unix this routine is
- *	case sensetive, on Windows this matches mixed case.
+ *	case sensitive, on Windows this matches mixed case.
  *
  * Results:
  *	The return value is the index in environ of an entry with the name
diff --git a/unix/tclUnixNotfy.c b/unix/tclUnixNotfy.c
index 6ecde5d..402e04f 100644
--- a/unix/tclUnixNotfy.c
+++ b/unix/tclUnixNotfy.c
@@ -439,7 +439,7 @@ AtForkChild(void)
 
 	    /*
 	     * The tsdPtr from before the fork is copied as well. But since we
-	     * are paranoic, we don't trust its condvar and reset it.
+	     * are paranoiac, we don't trust its condvar and reset it.
 	     */
 #ifdef __CYGWIN__
 	    DestroyWindow(tsdPtr->hwnd);
diff --git a/unix/tclUnixPipe.c b/unix/tclUnixPipe.c
index 19127d2..9923ba8 100644
--- a/unix/tclUnixPipe.c
+++ b/unix/tclUnixPipe.c
@@ -393,12 +393,12 @@ TclpCreateProcess(
 				 * receive no standard input. */
     TclFile outputFile,		/* If non-NULL, gives the file that receives
 				 * output from the child process. If
-				 * outputFile file is not writeable or is
+				 * outputFile file is not writable or is
 				 * NULL, output from the child will be
 				 * discarded. */
     TclFile errorFile,		/* If non-NULL, gives the file that receives
 				 * errors from the child process. If errorFile
-				 * file is not writeable or is NULL, errors
+				 * file is not writable or is NULL, errors
 				 * from the child will be discarded. errorFile
 				 * may be the same as outputFile. */
     Tcl_Pid *pidPtr)		/* If this function is successful, pidPtr is
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h
index 54f98c8..cb1adc5 100644
--- a/unix/tclUnixPort.h
+++ b/unix/tclUnixPort.h
@@ -501,7 +501,7 @@ extern int	gettimeofday(struct timeval *tp,
 
 /*
  *---------------------------------------------------------------------------
- * Not all systems declare the errno variable in errno.h. so this file does it
+ * Not all systems declare the errno variable in errno.h, so this file does it
  * explicitly. The list of system error messages also isn't generally declared
  * in a header file anywhere.
  *---------------------------------------------------------------------------
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index dec3833..1b2fd1b 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -41,7 +41,7 @@ typedef union {
 } address;
 
 /*
- * This structure describes per-instance state of a tcp based channel.
+ * This structure describes per-instance state of a tcp-based channel.
  */
 
 typedef struct TcpState TcpState;
@@ -54,7 +54,7 @@ typedef struct TcpFdList {
 
 struct TcpState {
     Tcl_Channel channel;	/* Channel associated with this file. */
-    int flags;			/* ORed combination of the bitfields defined
+    int flags;			/* OR'ed combination of the bitfields defined
 				 * below. */
     TcpFdList fds;		/* The file descriptors of the sockets. */
     int interest;		/* Event types of interest */
@@ -82,7 +82,7 @@ struct TcpState {
 };
 
 /*
- * These bits may be ORed together into the "flags" field of a TcpState
+ * These bits may be OR'ed together into the "flags" field of a TcpState
  * structure.
  */
 
@@ -386,17 +386,17 @@ TcpBlockModeProc(
  *
  *	Check the state of an async connect process. If a connection attempt
  *	terminated, process it, which may finalize it or may start the next
- *	attempt. If a connect error occures, it is saved in
+ *	attempt. If a connect error occurs, it is saved in
  *	statePtr->connectError to be reported by 'fconfigure -error'.
  *
  *	There are two modes of operation, defined by errorCodePtr:
- *	 *  non-NULL: Called by explicite read/write command. Blocks if the
+ *	 *  non-NULL: Called by explicit read/write command. Blocks if the
  *	    socket is blocking.
  *	    May return two error codes:
  *	     *	EWOULDBLOCK: if connect is still in progress
  *	     *	ENOTCONN: if connect failed. This would be the error message
- *		of a rect or sendto syscall so this is emulated here.
- *	 *  NULL: Called by a backround operation. Do not block and do not
+ *		of a recv or sendto syscall so this is emulated here.
+ *	 *  NULL: Called by a background operation. Do not block and do not
  *	    return any error code.
  *
  * Results:
@@ -428,7 +428,7 @@ WaitForConnect(
     }
 
     /*
-     * Check if an async connect is running. If not return ok
+     * Check if an async connect is running. If not return ok.
      */
 
     if (!GOT_BITS(statePtr->flags, TCP_ASYNC_PENDING)) {
@@ -1201,7 +1201,7 @@ TcpWatchProc(
 	 * socket file descriptor is writable when the other end of the socket
 	 * is closed.  This is in contrast to the guarantees Tcl makes that
 	 * its channels become writable and fire writable events on an error
-	 * conditon.  This has caused a leak of file descriptors in a state of
+	 * condition.  This has caused a leak of file descriptors in a state of
 	 * background flushing.  See Tcl ticket 1758a0b603.
 	 *
 	 * As a workaround, when our caller indicates an interest in writable
@@ -1601,7 +1601,7 @@ Tcl_MakeTcpClientChannel(
 void *
 TclpMakeTcpClientChannelMode(
     void *sock,		/* The socket to wrap up into a channel. */
-    int mode)			/* ORed combination of TCL_READABLE and
+    int mode)			/* OR'ed combination of TCL_READABLE and
 				 * TCL_WRITABLE to indicate file mode. */
 {
     TcpState *statePtr;
diff --git a/unix/tclUnixTest.c b/unix/tclUnixTest.c
index b482464..0f73b57 100644
--- a/unix/tclUnixTest.c
+++ b/unix/tclUnixTest.c
@@ -594,7 +594,7 @@ TestgotsigCmd(
  *
  *	Implements the "testchmod" cmd.  Used when testing "file" command.
  *	The only attribute used by the Windows platform is the user write
- *	flag; if this is not set, the file is made read-only.  Otehrwise, the
+ *	flag; if this is not set, the file is made read-only.  Otherwise, the
  *	file is made read-write.
  *
  * Results:
diff --git a/unix/tclXtNotify.c b/unix/tclXtNotify.c
index ab1bfee..aa88760 100644
--- a/unix/tclXtNotify.c
+++ b/unix/tclXtNotify.c
@@ -17,7 +17,7 @@
 #include "tclInt.h"
 
 /*
- * This structure is used to keep track of the notifier info for a a
+ * This structure is used to keep track of the notifier info for a
  * registered file.
  */