From cf087b8bcbf673840c1339d32015a6c63ab38f81 Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Wed, 13 Jan 2010 12:08:30 +0000
Subject: Improve choice of keywords

---
 doc/Exit.3       | 4 ++--
 doc/FileSystem.3 | 4 ++--
 doc/LinkVar.3    | 4 ++--
 doc/Tcl.n        | 4 +++-
 doc/apply.n      | 2 +-
 doc/catch.n      | 4 ++--
 doc/concat.n     | 4 ++--
 doc/encoding.n   | 4 ++--
 doc/error.n      | 4 ++--
 doc/exit.n       | 4 ++--
 doc/file.n       | 5 +++--
 doc/for.n        | 4 ++--
 doc/foreach.n    | 4 ++--
 doc/list.n       | 4 ++--
 doc/load.n       | 6 +++---
 doc/regsub.n     | 4 ++--
 doc/return.n     | 4 ++--
 doc/socket.n     | 4 ++--
 doc/subst.n      | 4 ++--
 doc/tclsh.1      | 4 ++--
 doc/tclvars.n    | 5 +++--
 doc/unknown.n    | 4 ++--
 doc/update.n     | 4 ++--
 doc/uplevel.n    | 4 ++--
 doc/upvar.n      | 4 ++--
 doc/vwait.n      | 4 ++--
 26 files changed, 55 insertions(+), 51 deletions(-)

diff --git a/doc/Exit.3 b/doc/Exit.3
index f95a9d1..66ce3be 100644
--- a/doc/Exit.3
+++ b/doc/Exit.3
@@ -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: Exit.3,v 1.9 2008/10/15 10:43:37 dkf Exp $
+'\" RCS: @(#) $Id: Exit.3,v 1.10 2010/01/13 12:08:30 dkf Exp $
 '\" 
 .so man.macros
 .TH Tcl_Exit 3 8.5 Tcl "Tcl Library Procedures"
@@ -139,4 +139,4 @@ cast to a ClientData value.
 .SH "SEE ALSO"
 exit(n)
 .SH KEYWORDS
-callback, cleanup, dynamic loading, end application, exit, unloading, thread
+abort, callback, cleanup, dynamic loading, end application, exit, unloading, thread
diff --git a/doc/FileSystem.3 b/doc/FileSystem.3
index 694c718..3a19dd0 100644
--- a/doc/FileSystem.3
+++ b/doc/FileSystem.3
@@ -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: FileSystem.3,v 1.68 2009/11/27 14:35:10 dkf Exp $
+'\" RCS: @(#) $Id: FileSystem.3,v 1.69 2010/01/13 12:08:30 dkf Exp $
 '\" 
 .so man.macros
 .TH Filesystem 3 8.4 Tcl "Tcl Library Procedures"
@@ -1623,4 +1623,4 @@ directory to the value specified in \fIpathPtr\fR. The function returns
 .SH "SEE ALSO"
 cd(n), file(n), filename(n), load(n), open(n), pwd(n), source(n), unload(n)
 .SH KEYWORDS
-stat, access, filesystem, vfs, virtual
+stat, access, filesystem, vfs, virtual filesystem
diff --git a/doc/LinkVar.3 b/doc/LinkVar.3
index 5ff0565..3801026 100644
--- a/doc/LinkVar.3
+++ b/doc/LinkVar.3
@@ -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: LinkVar.3,v 1.18 2009/09/03 08:07:07 dkf Exp $
+'\" RCS: @(#) $Id: LinkVar.3,v 1.19 2010/01/13 12:08:30 dkf Exp $
 '\" 
 .so man.macros
 .TH Tcl_LinkVar 3 7.5 Tcl "Tcl Library Procedures"
@@ -206,4 +206,4 @@ to indicate to the thread hosting the interpreter that it is ready to run
 .SH "SEE ALSO"
 Tcl_TraceVar(3)
 .SH KEYWORDS
-boolean, integer, link, read-only, real, string, traces, variable
+boolean, integer, link, read-only, real, string, trace, variable
diff --git a/doc/Tcl.n b/doc/Tcl.n
index 70e903a..fd31dfc 100644
--- a/doc/Tcl.n
+++ b/doc/Tcl.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: Tcl.n,v 1.23 2009/12/11 14:01:53 dkf Exp $
+'\" RCS: @(#) $Id: Tcl.n,v 1.24 2010/01/13 12:08:30 dkf Exp $
 '\"
 .so man.macros
 .TH Tcl n "8.5" Tcl "Tcl Built-In Commands"
@@ -246,6 +246,8 @@ except for argument expansion as specified in rule [5].
 For example, during variable substitution the entire value of
 the variable becomes part of a single word, even if the variable's
 value contains spaces.
+.SH KEYWORDS
+backslash, command, comment, script, substitution, variable
 '\" Local Variables:
 '\" mode: nroff
 '\" fill-column: 78
diff --git a/doc/apply.n b/doc/apply.n
index 8fd568c..e76c1e5 100644
--- a/doc/apply.n
+++ b/doc/apply.n
@@ -96,4 +96,4 @@ set vbl abc
 .SH "SEE ALSO"
 proc(n), uplevel(n)
 .SH KEYWORDS
-argument, procedure, anonymous function
+anonymous function, argument, lambda, procedure, 
diff --git a/doc/catch.n b/doc/catch.n
index 1c617b3..a21fabd 100644
--- a/doc/catch.n
+++ b/doc/catch.n
@@ -6,7 +6,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: catch.n,v 1.22 2009/11/16 18:00:11 dgp Exp $
+'\" RCS: @(#) $Id: catch.n,v 1.23 2010/01/13 12:08:30 dkf Exp $
 '\" 
 .so man.macros
 .TH catch n "8.5" Tcl "Tcl Built-In Commands"
@@ -92,4 +92,4 @@ documentation for the \fBreturn\fR command.
 .SH "SEE ALSO" 
 break(n), continue(n), dict(n), error(n), return(n), tclvars(n)
 .SH KEYWORDS
-catch, error
+catch, error, exception
diff --git a/doc/concat.n b/doc/concat.n
index 23ecb2d..7cda15c 100644
--- a/doc/concat.n
+++ b/doc/concat.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: concat.n,v 1.13 2009/04/27 12:31:38 dkf Exp $
+'\" RCS: @(#) $Id: concat.n,v 1.14 2010/01/13 12:08:30 dkf Exp $
 '\" 
 .so man.macros
 .TH concat n 8.3 Tcl "Tcl Built-In Commands"
@@ -54,7 +54,7 @@ values, as can be seen here:
 .SH "SEE ALSO"
 append(n), eval(n), join(n)
 .SH KEYWORDS
-concatenate, join, lists
+concatenate, join, list
 '\" Local Variables:
 '\" mode: nroff
 '\" End:
diff --git a/doc/encoding.n b/doc/encoding.n
index c4c9637..4e31bff 100644
--- a/doc/encoding.n
+++ b/doc/encoding.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: encoding.n,v 1.17 2008/10/15 10:43:37 dkf Exp $
+'\" RCS: @(#) $Id: encoding.n,v 1.18 2010/01/13 12:08:30 dkf Exp $
 '\" 
 .so man.macros
 .TH encoding n "8.1" Tcl "Tcl Built-In Commands"
@@ -94,4 +94,4 @@ which is the Hiragana letter HA.
 .SH "SEE ALSO"
 Tcl_GetEncoding(3)
 .SH KEYWORDS
-encoding
+encoding, unicode
diff --git a/doc/error.n b/doc/error.n
index 2ac0a65..d3cf694 100644
--- a/doc/error.n
+++ b/doc/error.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: error.n,v 1.13 2008/10/17 10:22:25 dkf Exp $
+'\" RCS: @(#) $Id: error.n,v 1.14 2010/01/13 12:08:30 dkf Exp $
 '\" 
 .so man.macros
 .TH error n "" Tcl "Tcl Built-In Commands"
@@ -74,4 +74,4 @@ if {1+2 != 3} {
 .SH "SEE ALSO"
 catch(n), return(n)
 .SH KEYWORDS
-error
+error, exception
diff --git a/doc/exit.n b/doc/exit.n
index 6fdc8eb..46728cf 100644
--- a/doc/exit.n
+++ b/doc/exit.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: exit.n,v 1.10 2008/10/17 10:22:25 dkf Exp $
+'\" RCS: @(#) $Id: exit.n,v 1.11 2010/01/13 12:08:30 dkf Exp $
 '\" 
 .so man.macros
 .TH exit n "" Tcl "Tcl Built-In Commands"
@@ -50,4 +50,4 @@ if {[catch {main} msg options]} {
 .SH "SEE ALSO"
 exec(n)
 .SH KEYWORDS
-exit, process
+abort, exit, process
diff --git a/doc/file.n b/doc/file.n
index da54c0d..70f3257 100644
--- a/doc/file.n
+++ b/doc/file.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: file.n,v 1.57 2009/12/14 10:03:13 dkf Exp $
+'\" RCS: @(#) $Id: file.n,v 1.58 2010/01/13 12:08:30 dkf Exp $
 '\" 
 .so man.macros
 .TH file n 8.3 Tcl "Tcl Built-In Commands"
@@ -537,7 +537,8 @@ exec {*}[auto_execok start] {} [\fBfile nativename\fR ~/example.txt]
 filename(n), open(n), close(n), eof(n), gets(n), tell(n), seek(n),
 fblocked(n), flush(n)
 .SH KEYWORDS
-attributes, copy files, delete files, directory, file, move files, name, rename files, stat
+attributes, copy files, delete files, directory, file, move files, name,
+rename files, stat, user
 '\" Local Variables:
 '\" mode: nroff
 '\" fill-column: 78
diff --git a/doc/for.n b/doc/for.n
index 1931538..91a85de 100644
--- a/doc/for.n
+++ b/doc/for.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: for.n,v 1.10 2008/10/17 10:22:25 dkf Exp $
+'\" RCS: @(#) $Id: for.n,v 1.11 2010/01/13 12:08:30 dkf Exp $
 '\" 
 .so man.macros
 .TH for n "" Tcl "Tcl Built-In Commands"
@@ -83,4 +83,4 @@ for {set x 1} {$x<=1024} {set x [expr {$x * 2}]} {
 .SH "SEE ALSO"
 break, continue, foreach, while
 .SH KEYWORDS
-for, iteration, looping
+for, iteration, loop
diff --git a/doc/foreach.n b/doc/foreach.n
index 47488c7..37bb455 100644
--- a/doc/foreach.n
+++ b/doc/foreach.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: foreach.n,v 1.11 2008/10/17 10:22:25 dkf Exp $
+'\" RCS: @(#) $Id: foreach.n,v 1.12 2010/01/13 12:08:30 dkf Exp $
 '\" 
 .so man.macros
 .TH foreach n "" Tcl "Tcl Built-In Commands"
@@ -103,4 +103,4 @@ set x {}
 for(n), while(n), break(n), continue(n)
 
 .SH KEYWORDS
-foreach, iteration, list, looping
+foreach, iteration, list, loop
diff --git a/doc/list.n b/doc/list.n
index 6ec1b7c..cf6fe99 100644
--- a/doc/list.n
+++ b/doc/list.n
@@ -6,7 +6,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: list.n,v 1.13 2008/10/17 10:22:25 dkf Exp $
+'\" RCS: @(#) $Id: list.n,v 1.14 2010/01/13 12:08:30 dkf Exp $
 '\" 
 .so man.macros
 .TH list n "" Tcl "Tcl Built-In Commands"
@@ -52,7 +52,7 @@ lappend(n), lindex(n), linsert(n), llength(n), lrange(n),
 lrepeat(n),
 lreplace(n), lsearch(n), lset(n), lsort(n)
 .SH KEYWORDS
-element, list
+element, list, quoting
 '\"Local Variables:
 '\"mode: nroff
 '\"End:
diff --git a/doc/load.n b/doc/load.n
index 08adefb..8675dcd 100644
--- a/doc/load.n
+++ b/doc/load.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: load.n,v 1.24 2008/10/17 10:22:25 dkf Exp $
+'\" RCS: @(#) $Id: load.n,v 1.25 2010/01/13 12:08:30 dkf Exp $
 '\" 
 .so man.macros
 .TH load n 7.5 Tcl "Tcl Built-In Commands"
@@ -172,9 +172,9 @@ switch $tcl_platform(platform) {
 foo
 .CE
 .SH "SEE ALSO"
-info sharedlibextension, Tcl_StaticPackage(3), safe(n)
+info sharedlibextension, package(n), Tcl_StaticPackage(3), safe(n)
 .SH KEYWORDS
-binary code, loading, safe interpreter, shared library
+binary code, dynamic library, load, safe interpreter, shared library
 '\"Local Variables:
 '\"mode: nroff
 '\"End:
diff --git a/doc/regsub.n b/doc/regsub.n
index 471063e..963b5f6 100644
--- a/doc/regsub.n
+++ b/doc/regsub.n
@@ -6,7 +6,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: regsub.n,v 1.27 2009/02/24 21:04:58 dkf Exp $
+'\" RCS: @(#) $Id: regsub.n,v 1.28 2010/01/13 12:08:30 dkf Exp $
 '\" 
 .so man.macros
 .TH regsub n 8.3 Tcl "Tcl Built-In Commands"
@@ -185,7 +185,7 @@ set quoted [subst [\fBregsub\fR -all $RE $string $substitution]]
 .SH "SEE ALSO"
 regexp(n), re_syntax(n), subst(n), string(n)
 .SH KEYWORDS
-match, pattern, quoting, regular expression, substitute
+match, pattern, quoting, regular expression, substitution
 '\" Local Variables:
 '\" mode: nroff
 '\" End:
diff --git a/doc/return.n b/doc/return.n
index fc2d1f8..be1af76 100644
--- a/doc/return.n
+++ b/doc/return.n
@@ -6,7 +6,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: return.n,v 1.23 2010/01/13 09:48:16 dkf Exp $
+'\" RCS: @(#) $Id: return.n,v 1.24 2010/01/13 12:08:30 dkf Exp $
 '\" 
 .so man.macros
 .TH return n 8.5 Tcl "Tcl Built-In Commands"
@@ -303,7 +303,7 @@ proc myReturn {args} {
 .SH "SEE ALSO"
 break(n), catch(n), continue(n), dict(n), error(n), proc(n), source(n), tclvars(n)
 .SH KEYWORDS
-break, catch, continue, error, procedure, return
+break, catch, continue, error, exception, procedure, result, return
 .\" Local Variables:
 .\" mode: nroff
 .\" End:
diff --git a/doc/socket.n b/doc/socket.n
index aee5d5a..507fd6f 100644
--- a/doc/socket.n
+++ b/doc/socket.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: socket.n,v 1.17 2010/01/12 10:55:30 ferrieux Exp $
+'\" RCS: @(#) $Id: socket.n,v 1.18 2010/01/13 12:08:30 dkf Exp $
 .so man.macros
 .TH socket n 8.0 Tcl "Tcl Built-In Commands"
 .BS
@@ -186,4 +186,4 @@ puts "The time on $server is $line"
 .SH "SEE ALSO"
 fconfigure(n), flush(n), open(n), read(n)
 .SH KEYWORDS
-bind, channel, connection, domain name, host, network address, socket, tcp
+asynchronous I/O, bind, channel, connection, domain name, host, network address, socket, tcp
diff --git a/doc/subst.n b/doc/subst.n
index 3685c0f..e4a4f2d 100644
--- a/doc/subst.n
+++ b/doc/subst.n
@@ -6,7 +6,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: subst.n,v 1.17 2008/10/17 10:22:25 dkf Exp $
+'\" RCS: @(#) $Id: subst.n,v 1.18 2010/01/13 12:08:30 dkf Exp $
 '\" 
 .so man.macros
 .TH subst n 7.4 Tcl "Tcl Built-In Commands"
@@ -160,7 +160,7 @@ not
 .SH "SEE ALSO"
 Tcl(n), eval(n), break(n), continue(n)
 .SH KEYWORDS
-backslash substitution, command substitution, variable substitution
+backslash substitution, command substitution, quoting, substitution, variable substitution
 .\" Local Variables:
 .\" mode: nroff
 .\" End:
diff --git a/doc/tclsh.1 b/doc/tclsh.1
index 8e2163a..f9f3780 100644
--- a/doc/tclsh.1
+++ b/doc/tclsh.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: tclsh.1,v 1.17 2009/03/25 23:22:42 nijtmans Exp $
+'\" RCS: @(#) $Id: tclsh.1,v 1.18 2010/01/13 12:08:30 dkf Exp $
 '\" 
 .so man.macros
 .TH tclsh 1 "" Tcl "Tcl Applications"
@@ -146,4 +146,4 @@ See \fBTcl_StandardChannels\fR for more explanations.
 .SH "SEE ALSO"
 encoding(n), fconfigure(n), tclvars(n)
 .SH KEYWORDS
-argument, interpreter, prompt, script file, shell
+application, argument, interpreter, prompt, script file, shell
diff --git a/doc/tclvars.n b/doc/tclvars.n
index 60a16d7..f9f4dd1 100644
--- a/doc/tclvars.n
+++ b/doc/tclvars.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: tclvars.n,v 1.40 2009/02/24 21:04:58 dkf Exp $
+'\" RCS: @(#) $Id: tclvars.n,v 1.41 2010/01/13 12:08:30 dkf Exp $
 '\" 
 .so man.macros
 .TH tclvars n 8.0 Tcl "Tcl Built-In Commands"
@@ -495,7 +495,8 @@ the main Tk window.
 .SH "SEE ALSO"
 eval(n), library(n), tclsh(1), wish(1)
 .SH KEYWORDS
-arithmetic, bytecode, compiler, error, environment, POSIX, precision, subprocess, variables
+arithmetic, bytecode, compiler, error, environment, POSIX, precision,
+subprocess, user, variables
 '\" Local Variables:
 '\" mode: nroff
 '\" End:
diff --git a/doc/unknown.n b/doc/unknown.n
index 890e3c0..1b13c81 100644
--- a/doc/unknown.n
+++ b/doc/unknown.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: unknown.n,v 1.9 2007/12/13 15:22:33 dgp Exp $
+'\" RCS: @(#) $Id: unknown.n,v 1.10 2010/01/13 12:08:30 dkf Exp $
 '\" 
 .so man.macros
 .TH unknown n "" Tcl "Tcl Built-In Commands"
@@ -90,4 +90,4 @@ proc \fBunknown\fR args {
 .SH "SEE ALSO"
 info(n), proc(n), interp(n), library(n), namespace(n)
 .SH KEYWORDS
-error, non-existent command
+error, non-existent command, unknown
diff --git a/doc/update.n b/doc/update.n
index 91f329c..64adf34 100644
--- a/doc/update.n
+++ b/doc/update.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: update.n,v 1.11 2008/10/17 10:22:25 dkf Exp $
+'\" RCS: @(#) $Id: update.n,v 1.12 2010/01/13 12:08:30 dkf Exp $
 '\" 
 .so man.macros
 .TH update n 7.5 Tcl "Tcl Built-In Commands"
@@ -64,4 +64,4 @@ while {!$done} {
 .SH "SEE ALSO"
 after(n), interp(n)
 .SH KEYWORDS
-event, flush, handler, idle, update
+asynchronous I/O, event, flush, handler, idle, update
diff --git a/doc/uplevel.n b/doc/uplevel.n
index f4a26e7..016848b 100644
--- a/doc/uplevel.n
+++ b/doc/uplevel.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: uplevel.n,v 1.11 2008/10/17 10:22:25 dkf Exp $
+'\" RCS: @(#) $Id: uplevel.n,v 1.12 2010/01/13 12:08:30 dkf Exp $
 '\" 
 .so man.macros
 .TH uplevel n "" Tcl "Tcl Built-In Commands"
@@ -99,7 +99,7 @@ proc do {body while condition} {
 .SH "SEE ALSO"
 apply(n), namespace(n), upvar(n)
 .SH KEYWORDS
-context, level, namespace, stack frame, variables
+context, level, namespace, stack frame, variable
 .\" Local Variables:
 .\" mode: nroff
 .\" End:
diff --git a/doc/upvar.n b/doc/upvar.n
index d6baa45..08f053c 100644
--- a/doc/upvar.n
+++ b/doc/upvar.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: upvar.n,v 1.19 2010/01/13 09:42:02 dkf Exp $
+'\" RCS: @(#) $Id: upvar.n,v 1.20 2010/01/13 12:08:30 dkf Exp $
 '\" 
 .so man.macros
 .TH upvar n "" Tcl "Tcl Built-In Commands"
@@ -119,7 +119,7 @@ proc decr {varName {decrement 1}} {
 .SH "SEE ALSO"
 global(n), namespace(n), uplevel(n), variable(n)
 .SH KEYWORDS
-context, frame, global, level, namespace, procedure, variable
+context, frame, global, level, namespace, procedure, upvar, variable
 .\" Local Variables:
 .\" mode: nroff
 .\" End:
diff --git a/doc/vwait.n b/doc/vwait.n
index ed0bac2..9cd95cb 100644
--- a/doc/vwait.n
+++ b/doc/vwait.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: vwait.n,v 1.12 2009/07/11 17:11:44 dkf Exp $
+'\" RCS: @(#) $Id: vwait.n,v 1.13 2010/01/13 12:08:30 dkf Exp $
 '\" 
 .so man.macros
 .TH vwait n 8.0 Tcl "Tcl Built-In Commands"
@@ -239,7 +239,7 @@ coroutine task-3 eval {
 .SH "SEE ALSO"
 global(n), update(n)
 .SH KEYWORDS
-event, variable, wait
+asynchronous I/O, event, variable, wait
 '\" Local Variables:
 '\" mode: nroff
 '\" fill-column: 78
-- 
cgit v0.12