Fix [Bug 1386955]

3 files changed, 17 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index c87ece5..3007e79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-01  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
+
+	* doc/console.n, doc/wish.1: Made it clearer when and why the console
+	command is present. [Bug 1386955]
+
 2007-10-31  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
 
 	* library/demos/entry3.tcl: Improved description/comments so that
diff --git a/doc/console.n b/doc/console.n
index d7a1cf2..4f359cc 100644
--- a/doc/console.n
+++ b/doc/console.n
@@ -4,7 +4,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: console.n,v 1.8 2007/08/28 15:16:11 dkf Exp $
+'\" RCS: @(#) $Id: console.n,v 1.9 2007/11/01 10:19:11 dkf Exp $
 '\"
 .so man.macros
 .TH console n 8.4 Tk "Tk Built-In Commands"
@@ -15,7 +15,6 @@ console \- Control the console on systems without a real console
 .SH SYNOPSIS
 \fBconsole\fR \fIsubcommand\fR ?\fIarg ...\fR?
 .BE
-
 .SH DESCRIPTION
 .PP
 The console window is a replacement for a real console to allow input
@@ -24,7 +23,10 @@ a real console.  It is implemented as a separate interpreter with the
 Tk toolkit loaded, and control over this interpreter is given through
 the \fBconsole\fR command.  The behaviour of the console window is
 defined mainly through the contents of the \fIconsole.tcl\fR file in
-the Tk library.
+the Tk library. Note that this command is not available when Tk is
+loaded into a tclsh interpreter with
+.QW "\fBpackage require Tk"
+as a conventional terminal is expected to be present in that case.
 .PP
 .TP
 \fBconsole eval \fIscript\fR
diff --git a/doc/wish.1 b/doc/wish.1
index 1df677e..625f4e8 100644
--- a/doc/wish.1
+++ b/doc/wish.1
@@ -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: wish.1,v 1.8 2007/10/29 16:04:14 dkf Exp $
+'\" RCS: @(#) $Id: wish.1,v 1.9 2007/11/01 10:19:11 dkf Exp $
 '\" 
 .so man.macros
 .TH wish 1 8.0 Tk "Tk Applications"
@@ -91,6 +91,12 @@ There is no automatic evaluation of
 .QW \fB.wishrc\fR
 when the name of a script file is presented on the \fBwish\fR command line,
 but the script file can always \fBsource\fR it if desired.
+.PP
+Note that on Windows, the \fBwish\fIversion\fB.exe\fR program varies
+from the \fBtclsh\fIversion\fB.exe\fR program in an additional
+important way: it does not connect to a standard Windows console and
+is instead a windowed program. Because of this, it additionally
+provides access to its own \fBconsole\fR command.
 .SH "OPTION PROCESSING"
 .PP
 \fBWish\fR automatically processes all of the command-line options