merge updates from HEAD

2 files changed, 50 insertions, 4 deletions

diff --git a/doc/CrtConsoleChan.3 b/doc/CrtConsoleChan.3
new file mode 100644
index 0000000..10f29a2
--- /dev/null
+++ b/doc/CrtConsoleChan.3
@@ -0,0 +1,46 @@
+'\"
+'\" Copyright (c) 2007 ActiveState Software Inc.
+'\"
+'\" See the file "license.terms" for information on usage and redistribution
+'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+'\" 
+'\" RCS: @(#) $Id: CrtConsoleChan.3,v 1.2.2.2 2007/11/12 19:22:37 dgp Exp $
+'\" 
+.so man.macros
+.TH Tk_InitConsoleChannels 3 8.5 Tk "Tk Library Procedures"
+.BS
+.SH NAME
+Tk_InitConsoleChannels \- Install the console channels as standard channels
+.SH SYNOPSIS
+.nf
+\fB#include <tk.h>\fR
+.sp
+\fBTk_InitConsoleChannels\fR(\fIinterp\fR)
+.SH ARGUMENTS
+.AS Tcl_Interp *interp in
+.AP Tcl_Interp *interp in
+Interpreter in which the console channels are created.
+.BE
+.SH DESCRIPTION
+.PP
+\fBTk_InitConsoleChannels\fR is invoked to create a set of console
+channels and install them as the standard channels. All I/O on these
+channels will be discarded until \fBTk_CreateConsoleWindow\fR is
+called to attach the console to a text widget.
+.PP
+This function is for use by shell applications based on Tk, like
+\fBwish\fR, on platforms which have no standard channels in graphical
+mode, like Win32.
+.PP
+The \fIinterp\fR argument is the interpreter in which to create and
+install the console channels.
+.PP
+\fBNOTE:\fR If this function is used it has to be called before the
+first call to \fBTcl_RegisterChannel\fR, directly, or indirectly
+through other channel functions. Because otherwise the standard
+channels will be already initialized to the system defaults, which will
+be nonsensical for the case \fBTk_InitConsoleChannels\fR is for.
+.SH "SEE ALSO"
+console(n)
+.SH KEYWORDS
+standard channels, console
diff --git a/doc/font.n b/doc/font.n
index 964851c..8786b8c 100644
--- a/doc/font.n
+++ b/doc/font.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: font.n,v 1.11.2.4 2007/11/02 14:51:39 dgp Exp $
+'\" RCS: @(#) $Id: font.n,v 1.11.2.5 2007/11/12 19:22:37 dgp Exp $
 '\" 
 .so man.macros
 .TH font n 8.0 Tk "Tk Built-In Commands"
@@ -27,7 +27,7 @@ first argument.  The following forms are currently supported:
 .
 Returns information about the actual attributes that are obtained when
 \fIfont\fR is used on \fIwindow\fR's display; the actual attributes obtained
-may differ from the attributes requested due to platform-dependant
+may differ from the attributes requested due to platform-dependent
 limitations, such as the availability of font families and pointsizes.
 \fIfont\fR is a font description; see \fBFONT DESCRIPTIONS\fR below.  If the
 \fIwindow\fR argument is omitted, it defaults to the main window.  If
@@ -179,7 +179,7 @@ Cases [1] and [2] must match the name of an existing named font or of a
 system font.  Cases [3], [4], and [5] are accepted on all
 platforms and the closest available font will be used.  In some situations
 it may not be possible to find any close font (e.g., the font family was
-a garbage value); in that case, some system-dependant default font is
+a garbage value); in that case, some system-dependent default font is
 chosen.  If the font description does not match any of the above patterns,
 an error is generated.
 .SH "FONT METRICS"
@@ -251,7 +251,7 @@ The desired size of the font.  If the \fIsize\fR argument is a positive
 number, it is interpreted as a size in points.  If \fIsize\fR is a negative
 number, its absolute value is interpreted as a size in pixels.  If a
 font cannot be displayed at the specified size, a nearby size will be
-chosen.  If \fIsize\fR is unspecified or zero, a platform-dependant default
+chosen.  If \fIsize\fR is unspecified or zero, a platform-dependent default
 size will be chosen.
 .RS
 .PP