Standardize style of section refs & public symbols. Remove displayed tabs

40 files changed, 555 insertions, 546 deletions

diff --git a/ChangeLog b/ChangeLog
index 14fc668..c004c20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-19  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
+
+	* doc/*: Standardize style of references to manual sections and public
+	Tcl symbols along the lines of what I set out in [Tcl Patch 1022527].
+
 2004-09-18  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* win/tkWinWm.c (WmAttributesCmd): correct -alpha 0.0/1.0 setting
diff --git a/doc/3DBorder.3 b/doc/3DBorder.3
index 4ad5803..999dae4 100644
--- a/doc/3DBorder.3
+++ b/doc/3DBorder.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: 3DBorder.3,v 1.4 2002/08/05 04:30:38 dgp Exp $
+'\" RCS: @(#) $Id: 3DBorder.3,v 1.5 2004/09/19 16:05:36 dkf Exp $
 '\" 
 .so man.macros
 .TH Tk_Alloc3DBorderFromObj 3 8.1 Tk "Tk Library Procedures"
@@ -100,8 +100,8 @@ given by \fIx\fR, \fIy\fR, \fIwidth\fR, \fIheight\fR, negative means
 border is outside rectangle.
 .AP int relief in
 Indicates 3-D position of interior of object relative to exterior;
-should be TK_RELIEF_RAISED, TK_RELIEF_SUNKEN, TK_RELIEF_GROOVE, 
-TK_RELIEF_SOLID, or TK_RELIEF_RIDGE (may also be TK_RELIEF_FLAT
+should be \fBTK_RELIEF_RAISED\fR, \fBTK_RELIEF_SUNKEN\fR, \fBTK_RELIEF_GROOVE\fR,
+\fBTK_RELIEF_SOLID\fR, or \fBTK_RELIEF_RIDGE\fR (may also be \fBTK_RELIEF_FLAT\fR
 for \fBTk_Fill3DRectangle\fR).
 .AP XPoint *pointPtr in
 Pointer to array of points describing the set of vertices in a polygon.
@@ -112,14 +112,14 @@ Number of points at \fI*pointPtr\fR.
 .AP int polyBorderWidth in
 Width of border in pixels.  If positive, border is drawn to left of
 trajectory given by \fIpointPtr\fR;  if negative, border is drawn to
-right of trajectory.  If \fIleftRelief\fR is TK_RELIEF_GROOVE or
-TK_RELIEF_RIDGE then the border is centered on the trajectory.
+right of trajectory.  If \fIleftRelief\fR is \fBTK_RELIEF_GROOVE\fR or
+\fBTK_RELIEF_RIDGE\fR then the border is centered on the trajectory.
 .AP int leftRelief in
-Height of left side of polygon's path relative to right.  TK_RELIEF_RAISED
-means left side should appear higher and TK_RELIEF_SUNKEN means right side
+Height of left side of polygon's path relative to right.  \fBTK_RELIEF_RAISED\fR
+means left side should appear higher and \fBTK_RELIEF_SUNKEN\fR means right side
 should appear higher;
-TK_RELIEF_GROOVE and TK_RELIEF_RIDGE mean the obvious things.
-For \fBTk_Fill3DPolygon\fR, TK_RELIEF_FLAT may also be specified to
+\fBTK_RELIEF_GROOVE\fR and \fBTK_RELIEF_RIDGE\fR mean the obvious things.
+For \fBTk_Fill3DPolygon\fR, \fBTK_RELIEF_FLAT\fR may also be specified to
 indicate no difference in height.
 .AP int leftBevel in
 Non-zero means this bevel forms the left side of the object;  zero means
@@ -140,7 +140,7 @@ Non-zero means this bevel forms the top side of the object;  zero means
 it forms the bottom side.
 .AP int which in
 Specifies which of the border's graphics contexts is desired.
-Must be TK_3D_FLAT_GC, TK_3D_LIGHT_GC, or TK_3D_DARK_GC.
+Must be \fBTK_3D_FLAT_GC\fR, \fBTK_3D_LIGHT_GC\fR, or \fBTK_3D_DARK_GC\fR.
 .BE
 
 .SH DESCRIPTION
@@ -199,10 +199,10 @@ within \fIdrawable\fR (usually \fIx\fR and \fIy\fR are zero and
 \fIborderWidth\fR specifies the number of pixels actually
 occupied by the border.  The \fIrelief\fR argument indicates
 which of several three-dimensional effects is desired:
-TK_RELIEF_RAISED means that the interior of the rectangle should appear raised
-relative to the exterior of the rectangle, and
-TK_RELIEF_SUNKEN means that the interior should appear depressed.
-TK_RELIEF_GROOVE and TK_RELIEF_RIDGE mean that there should appear to be
+\fBTK_RELIEF_RAISED\fR means that the interior of the rectangle should
+appear raised relative to the exterior of the rectangle, and
+\fBTK_RELIEF_SUNKEN\fR means that the interior should appear depressed.
+\fBTK_RELIEF_GROOVE\fR and \fBTK_RELIEF_RIDGE\fR mean that there should appear to be
 a groove or ridge around the exterior of the rectangle.
 .PP
 \fBTk_Fill3DRectangle\fR is somewhat like \fBTk_Draw3DRectangle\fR except
@@ -211,7 +211,7 @@ that it first fills the rectangular area with the background color
 to the color used to create \fIborder\fR).  Then it calls
 \fBTk_Draw3DRectangle\fR to draw a border just inside the outer edge of
 the rectangular area.  The argument \fIrelief\fR indicates the desired
-effect (TK_RELIEF_FLAT means no border should be drawn; all that
+effect (\fBTK_RELIEF_FLAT\fR means no border should be drawn; all that
 happens is to fill the rectangle with the background color).
 .PP
 The procedure \fBTk_Draw3DPolygon\fR may be used to draw more complex
@@ -230,7 +230,7 @@ it's not clear how useful this is.
 \fBTk_Fill3DRectangle\fR is to \fBTk_Draw3DRectangle\fR:  it fills
 the polygonal area with the background color from \fIborder\fR,
 then calls \fBTk_Draw3DPolygon\fR to draw a border around the
-area (unless \fIleftRelief\fR is TK_RELIEF_FLAT;  in this case no
+area (unless \fIleftRelief\fR is \fBTK_RELIEF_FLAT\fR; in this case no
 border is drawn).
 .PP
 The procedures \fBTk_3DVerticalBevel\fR and \fBTk_3DHorizontalBevel\fR
@@ -284,9 +284,9 @@ as long as \fIborder\fR exists.
 The procedure \fBTk_3DBorderGC\fR returns one of the X graphics contexts
 that are used to draw the border.
 The argument \fIwhich\fR selects which one of the three possible GC's:
-TK_3D_FLAT_GC returns the context used for flat surfaces,
-TK_3D_LIGHT_GC returns the context for light shadows,
-and TK_3D_DARK_GC returns the context for dark shadows.
+\fBTK_3D_FLAT_GC\fR returns the context used for flat surfaces,
+\fBTK_3D_LIGHT_GC\fR returns the context for light shadows,
+and \fBTK_3D_DARK_GC\fR returns the context for dark shadows.
 .PP
 .VS 8.1
 When a border is no longer needed, \fBTk_Free3DBorderFromObj\fR
diff --git a/doc/AddOption.3 b/doc/AddOption.3
index 940904b..2b02622 100644
--- a/doc/AddOption.3
+++ b/doc/AddOption.3
@@ -2,7 +2,7 @@
 '\" Copyright (c) 1998-2000 by Scriptics Corporation.
 '\" All rights reserved.
 '\" 
-'\" RCS: @(#) $Id: AddOption.3,v 1.2 2002/01/25 21:09:36 dgp Exp $
+'\" RCS: @(#) $Id: AddOption.3,v 1.3 2004/09/19 16:05:36 dkf Exp $
 '\" 
 '\"
 .so man.macros
@@ -37,7 +37,7 @@ classes separated by asterisks or dots, in the usual X format.
 this value will be returned in calls to \fBTk_GetOption\fR.
 \fIPriority\fR specifies the priority of the value; when options are
 queried using \fBTk_GetOption\fR, the value with the highest priority
-is returned.  \fIPriority\fR must be between 0 and TK_MAX_PRIO.  Some
+is returned.  \fIPriority\fR must be between 0 and \fBTK_MAX_PRIO\fR.  Some
 common priority values are:
 .TP
 20
diff --git a/doc/BindTable.3 b/doc/BindTable.3
index a4e9f28..8668d64 100644
--- a/doc/BindTable.3
+++ b/doc/BindTable.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: BindTable.3,v 1.3 2002/08/05 04:30:38 dgp Exp $
+'\" RCS: @(#) $Id: BindTable.3,v 1.4 2004/09/19 16:05:36 dkf Exp $
 '\" 
 .so man.macros
 .TH Tk_CreateBindingTable 3 4.0 Tk "Tk Library Procedures"
@@ -119,7 +119,7 @@ message is left in \fIinterp->result\fR.
 \fBTk_DeleteBinding\fR removes from \fIbindingTable\fR the
 binding given by \fIobject\fR and \fIeventString\fR, if
 such a binding exists.
-\fBTk_DeleteBinding\fR always returns TCL_OK.
+\fBTk_DeleteBinding\fR always returns \fBTCL_OK\fR.
 In some cases it may reset \fIinterp->result\fR to the default
 empty value.
 .PP
diff --git a/doc/CanvPsY.3 b/doc/CanvPsY.3
index af051ca..36e3264 100644
--- a/doc/CanvPsY.3
+++ b/doc/CanvPsY.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: CanvPsY.3,v 1.5 2000/07/25 21:14:34 jenglish Exp $
+'\" RCS: @(#) $Id: CanvPsY.3,v 1.6 2004/09/19 16:05:36 dkf Exp $
 '\" 
 .so man.macros
 .TH Tk_CanvasPs 3 4.0 Tk "Tk Library Procedures"
@@ -85,15 +85,15 @@ transformation.
 of a bitmap.
 The Postscript is generated in proper image data format for Postscript,
 i.e., as data between angle brackets, one bit per pixel.
-The Postscript is appended to \fIinterp->result\fR and TCL_OK is returned
-unless an error occurs, in which case TCL_ERROR is returned and
+The Postscript is appended to \fIinterp->result\fR and \fBTCL_OK\fR is returned
+unless an error occurs, in which case \fBTCL_ERROR\fR is returned and
 \fIinterp->result\fR is overwritten with an error message.
 .PP
 \fBTk_CanvasPsColor\fR generates Postscript to set the current color
 to correspond to its \fIcolorPtr\fR argument, taking into account any
 color map specified in the \fBpostscript\fR command.
 It appends the Postscript to \fIinterp->result\fR and returns
-TCL_OK unless an error occurs, in which case TCL_ERROR is returned and
+\fBTCL_OK\fR unless an error occurs, in which case \fBTCL_ERROR\fR is returned and
 \fIinterp->result\fR is overwritten with an error message.
 .PP
 \fBTk_CanvasPsFont\fR generates Postscript that sets the current font
@@ -101,8 +101,8 @@ to match \fItkFont\fR as closely as possible.
 \fBTk_CanvasPsFont\fR takes into account any font map specified
 in the \fBpostscript\fR command, and it does
 the best it can at mapping X fonts to Postscript fonts.
-It appends the Postscript to \fIinterp->result\fR and returns TCL_OK
-unless an error occurs, in which case TCL_ERROR is returned and
+It appends the Postscript to \fIinterp->result\fR and returns \fBTCL_OK\fR
+unless an error occurs, in which case \fBTCL_ERROR\fR is returned and
 \fIinterp->result\fR is overwritten with an error message.
 .PP
 \fBTk_CanvasPsPath\fR generates Postscript to set the current path
@@ -114,8 +114,8 @@ current path in stippled fashion.
 It uses \fIbitmap\fR as the stipple pattern and the current Postscript
 color;  ones in the stipple bitmap are drawn in the current color, and
 zeroes are not drawn at all.
-The Postscript is appended to \fIinterp->result\fR and TCL_OK is
-returned, unless an error occurs, in which case TCL_ERROR is returned and
+The Postscript is appended to \fIinterp->result\fR and \fBTCL_OK\fR is
+returned, unless an error occurs, in which case \fBTCL_ERROR\fR is returned and
 \fIinterp->result\fR is overwritten with an error message.
 
 .SH KEYWORDS
diff --git a/doc/CanvTkwin.3 b/doc/CanvTkwin.3
index 927b73e..7a35766 100644
--- a/doc/CanvTkwin.3
+++ b/doc/CanvTkwin.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: CanvTkwin.3,v 1.3 2002/01/25 21:09:36 dgp Exp $
+'\" RCS: @(#) $Id: CanvTkwin.3,v 1.4 2004/09/19 16:05:36 dkf Exp $
 '\" 
 .so man.macros
 .TH Tk_CanvasTkwin 3 4.1 Tk "Tk Library Procedures"
@@ -87,9 +87,9 @@ coordinate (such as \fB2p\fR or \fB1.6c\fR) into a double-precision
 canvas coordinate.
 If \fIstring\fR is a valid coordinate description then \fBTk_CanvasGetCoord\fR
 stores the corresponding canvas coordinate at *\fIdoublePtr\fR
-and returns TCL_OK.
+and returns \fBTCL_OK\fR.
 Otherwise it stores an error message in \fIinterp->result\fR and
-returns TCL_ERROR.
+returns \fBTCL_ERROR\fR.
 .PP
 \fBTk_CanvasDrawableCoords\fR is called by type managers during
 redisplay to compute where to draw things.
@@ -146,14 +146,14 @@ structure for the \fB\-tags\fR option.   The code typically looks
 like this:
 .CS
 static Tk_CustomOption tagsOption = {Tk_CanvasTagsParseProc,
-	Tk_CanvasTagsPrintProc, (ClientData) NULL
+    Tk_CanvasTagsPrintProc, (ClientData) NULL
 };
 
 static Tk_ConfigSpec configSpecs[] = {
-	...
-	{TK_CONFIG_CUSTOM, "\-tags", (char *) NULL, (char *) NULL,
-		(char *) NULL, 0, TK_CONFIG_NULL_OK, &tagsOption},
-	...
+    ...
+    {TK_CONFIG_CUSTOM, "\-tags", (char *) NULL, (char *) NULL,
+        (char *) NULL, 0, TK_CONFIG_NULL_OK, &tagsOption},
+    ...
 };
 .CE
 
diff --git a/doc/CanvTxtInfo.3 b/doc/CanvTxtInfo.3
index 0d9f829..10fee39 100644
--- a/doc/CanvTxtInfo.3
+++ b/doc/CanvTxtInfo.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: CanvTxtInfo.3,v 1.2 1998/09/14 18:22:46 stanton Exp $
+'\" RCS: @(#) $Id: CanvTxtInfo.3,v 1.3 2004/09/19 16:05:36 dkf Exp $
 '\" 
 .so man.macros
 .TH Tk_CanvasTextInfo 3 4.0 Tk "Tk Library Procedures"
@@ -35,20 +35,20 @@ text.
 The structure has the following form:
 .CS
 typedef struct Tk_CanvasTextInfo {
-	Tk_3DBorder \fIselBorder\fR;
-	int \fIselBorderWidth\fR;
-	XColor *\fIselFgColorPtr\fR;
-	Tk_Item *\fIselItemPtr\fR;
-	int \fIselectFirst\fR;
-	int \fIselectLast\fR;
-	Tk_Item *\fIanchorItemPtr\fR;
-	int \fIselectAnchor\fR;
-	Tk_3DBorder \fIinsertBorder\fR;
-	int \fIinsertWidth\fR;
-	int \fIinsertBorderWidth\fR;
-	Tk_Item *\fIfocusItemPtr\fR;
-	int \fIgotFocus\fR;
-	int \fIcursorOn\fR;
+    Tk_3DBorder \fIselBorder\fR;
+    int \fIselBorderWidth\fR;
+    XColor *\fIselFgColorPtr\fR;
+    Tk_Item *\fIselItemPtr\fR;
+    int \fIselectFirst\fR;
+    int \fIselectLast\fR;
+    Tk_Item *\fIanchorItemPtr\fR;
+    int \fIselectAnchor\fR;
+    Tk_3DBorder \fIinsertBorder\fR;
+    int \fIinsertWidth\fR;
+    int \fIinsertBorderWidth\fR;
+    Tk_Item *\fIfocusItemPtr\fR;
+    int \fIgotFocus\fR;
+    int \fIcursorOn\fR;
 } Tk_CanvasTextInfo;
 .CE
 The \fBselBorder\fR field identifies a Tk_3DBorder that should be
diff --git a/doc/Clipboard.3 b/doc/Clipboard.3
index d3f35d8..4cf58d8 100644
--- a/doc/Clipboard.3
+++ b/doc/Clipboard.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: Clipboard.3,v 1.2 1998/09/14 18:22:46 stanton Exp $
+'\" RCS: @(#) $Id: Clipboard.3,v 1.3 2004/09/19 16:05:36 dkf Exp $
 '\" 
 .so man.macros
 .TH Tk_ClipboardClear 3 4.0 Tk "Tk Library Procedures"
@@ -46,8 +46,8 @@ number of targets.
 .PP
 \fBTk_ClipboardClear\fR claims the CLIPBOARD selection and frees any
 data items previously stored on the clipboard in this application.  
-It normally returns TCL_OK, but if an error occurs it returns
-TCL_ERROR and leaves an error message in \fIinterp->result\fR.
+It normally returns \fBTCL_OK\fR, but if an error occurs it returns
+\fBTCL_ERROR\fR and leaves an error message in \fIinterp->result\fR.
 \fBTk_ClipboardClear\fR must be called before a sequence of
 \fBTk_ClipboardAppend\fR calls can be issued.
 .PP
@@ -56,13 +56,13 @@ The first buffer for a given \fItarget\fR determines the \fIformat\fR
 for that \fItarget\fR.
 Any successive appends for that \fItarget\fR must have
 the same format or an error will be returned.
-\fBTk_ClipboardAppend\fR returns TCL_OK if the buffer is
+\fBTk_ClipboardAppend\fR returns \fBTCL_OK\fR if the buffer is
 successfully copied onto the clipboard.  If the clipboard is not
 currently owned by the application, either
 because \fBTk_ClipboardClear\fR has not been called or because
 ownership of the clipboard has changed since the last call to
 \fBTk_ClipboardClear\fR,
-\fBTk_ClipboardAppend\fR returns TCL_ERROR and leaves an error message in
+\fBTk_ClipboardAppend\fR returns \fBTCL_ERROR\fR and leaves an error message in
 \fIinterp->result\fR.
 .PP
 In order to guarantee atomicity, no event handling should occur
diff --git a/doc/ConfigWidg.3 b/doc/ConfigWidg.3
index b3b358e..69810a2 100644
--- a/doc/ConfigWidg.3
+++ b/doc/ConfigWidg.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: ConfigWidg.3,v 1.11 2004/08/22 15:43:20 dkf Exp $
+'\" RCS: @(#) $Id: ConfigWidg.3,v 1.12 2004/09/19 16:05:36 dkf Exp $
 '\" 
 .so man.macros
 .TH Tk_ConfigureWidget 3 4.1 Tk "Tk Library Procedures"
@@ -45,8 +45,8 @@ modified by \fBTk_ConfigureWidget\fR to hold configuration information.
 .AP int flags in
 If non-zero, then it specifies an OR-ed combination of flags that
 control the processing of configuration information.
-TK_CONFIG_ARGV_ONLY causes the option database and defaults to be
-ignored, and flag bits TK_CONFIG_USER_BIT and higher are used to
+\fBTK_CONFIG_ARGV_ONLY\fR causes the option database and defaults to be
+ignored, and flag bits \fBTK_CONFIG_USER_BIT\fR and higher are used to
 selectively disable entries in \fIspecs\fR.
 .AP "type name" type in
 The name of the type of a widget record.
@@ -89,10 +89,10 @@ a table specifying the configuration options that are supported
 \fIargv\fR) to fill in fields of a record (\fIwidgRec\fR).
 It uses the option database and defaults specified in \fIspecs\fR
 to fill in fields of \fIwidgRec\fR that are not specified in \fIargv\fR.
-\fBTk_ConfigureWidget\fR normally returns the value TCL_OK; in this
+\fBTk_ConfigureWidget\fR normally returns the value \fBTCL_OK\fR; in this
 case it does not modify \fIinterp\fR.
 If an error
-occurs then TCL_ERROR is returned and \fBTk_ConfigureWidget\fR will
+occurs then \fBTCL_ERROR\fR is returned and \fBTk_ConfigureWidget\fR will
 leave an error message in \fIinterp->result\fR in the standard Tcl
 fashion.
 In the event of an error return, some of the fields of \fIwidgRec\fR
@@ -106,18 +106,18 @@ expected by the widget.  Each of its entries specifies one configuration
 option and has the following structure:
 .CS
 typedef struct {
-	int \fItype\fR;
-	char *\fIargvName\fR;
-	char *\fIdbName\fR;
-	char *\fIdbClass\fR;
-	char *\fIdefValue\fR;
-	int \fIoffset\fR;
-	int \fIspecFlags\fR;
-	Tk_CustomOption *\fIcustomPtr\fR;
+    int \fItype\fR;
+    char *\fIargvName\fR;
+    char *\fIdbName\fR;
+    char *\fIdbClass\fR;
+    char *\fIdefValue\fR;
+    int \fIoffset\fR;
+    int \fIspecFlags\fR;
+    Tk_CustomOption *\fIcustomPtr\fR;
 } Tk_ConfigSpec;
 .CE
 The \fItype\fR field indicates what type of configuration option this is
-(e.g. TK_CONFIG_COLOR for a color value, or TK_CONFIG_INT for
+(e.g. \fBTK_CONFIG_COLOR\fR for a color value, or \fBTK_CONFIG_INT\fR for
 an integer value).  The \fItype\fR field indicates how to use the
 value of the option (more on this below).
 The \fIargvName\fR field is a string such as ``\-font'' or ``\-bg'',
@@ -132,7 +132,7 @@ about this option, and \fIspecFlags\fR contains additional information
 to control the processing of this configuration option (see FLAGS
 below).
 The last field, \fIcustomPtr\fR, is only used if \fItype\fR is
-TK_CONFIG_CUSTOM;  see CUSTOM OPTION TYPES below.
+\fBTK_CONFIG_CUSTOM\fR;  see CUSTOM OPTION TYPES below.
 .PP
 \fBTk_ConfigureWidget\fR first processes \fIargv\fR to see which
 (if any) configuration options are specified there.  \fIArgv\fR
@@ -148,15 +148,15 @@ a value is found, then it is used as the value for the option.
 Finally, if no entry is found in the option database, the
 \fIdefValue\fR field of the \fIspecs\fR entry is used as the
 value for the configuration option.  If the \fIdefValue\fR is
-NULL, or if the TK_CONFIG_DONT_SET_DEFAULT bit is set in
+NULL, or if the \fBTK_CONFIG_DONT_SET_DEFAULT\fR bit is set in
 \fIflags\fR, then there is no default value and this \fIspecs\fR entry
 will be ignored if no value is specified in \fIargv\fR or the
 option database.
 .PP
 Once a string value has been determined for a configuration option,
 \fBTk_ConfigureWidget\fR translates the string value into a more useful
-form, such as a color if \fItype\fR is TK_CONFIG_COLOR or an integer
-if \fItype\fR is TK_CONFIG_INT.  This value is then stored in the
+form, such as a color if \fItype\fR is \fBTK_CONFIG_COLOR\fR or an integer
+if \fItype\fR is \fBTK_CONFIG_INT\fR.  This value is then stored in the
 record pointed to by \fIwidgRec\fR.  This record is assumed to
 contain information relevant to the manager of the widget;  its exact
 type is unknown to \fBTk_ConfigureWidget\fR.  The \fIoffset\fR field
@@ -179,7 +179,7 @@ The value is converted to a \fBTk_Cursor\fR by calling
 \fBTk_GetCursor\fR and the result is stored in the target.
 In addition, the resulting cursor is made the active cursor
 for \fItkwin\fR by calling \fBXDefineCursor\fR.
-If TK_CONFIG_NULL_OK is specified in \fIspecFlags\fR then the value
+If \fBTK_CONFIG_NULL_OK\fR is specified in \fIspecFlags\fR then the value
 may be an empty string, in which case the target and \fItkwin\fR's
 active cursor will be set to \fBNone\fR.
 If the previous value of the target
@@ -196,7 +196,7 @@ The value must be an ASCII string identifying a bitmap in a form
 suitable for passing to \fBTk_GetBitmap\fR.  The value is converted
 to a \fBPixmap\fR by calling \fBTk_GetBitmap\fR and the result
 is stored in the target.
-If TK_CONFIG_NULL_OK is specified in \fIspecFlags\fR then the value
+If \fBTK_CONFIG_NULL_OK\fR is specified in \fIspecFlags\fR then the value
 may be an empty string, in which case the target is set to \fBNone\fR.
 If the previous value of the target
 wasn't \fBNone\fR, then it is freed by passing it to \fBTk_FreeBitmap\fR.
@@ -215,7 +215,7 @@ The value must be an ASCII string identifying a border color in a form
 suitable for passing to \fBTk_Get3DBorder\fR.  The value is converted
 to a (\fBTk_3DBorder *\fR) by calling \fBTk_Get3DBorder\fR and the result
 is stored in the target.
-If TK_CONFIG_NULL_OK is specified in \fIspecFlags\fR then the value
+If \fBTK_CONFIG_NULL_OK\fR is specified in \fIspecFlags\fR then the value
 may be an empty string, in which case the target will be set to NULL.
 If the previous value of the target
 wasn't NULL, then it is freed by passing it to \fBTk_Free3DBorder\fR.
@@ -233,7 +233,7 @@ The value must be an ASCII string identifying a color in a form
 suitable for passing to \fBTk_GetColor\fR.  The value is converted
 to an (\fBXColor *\fR) by calling \fBTk_GetColor\fR and the result
 is stored in the target.
-If TK_CONFIG_NULL_OK is specified in \fIspecFlags\fR then the value
+If \fBTK_CONFIG_NULL_OK\fR is specified in \fIspecFlags\fR then the value
 may be an empty string, in which case the target will be set to \fBNone\fR.
 If the previous value of the target
 wasn't NULL, then it is freed by passing it to \fBTk_FreeColor\fR.
@@ -246,7 +246,7 @@ that the new cursor is not made the active one for \fItkwin\fR.
 This option allows applications to define new option types.
 The \fIcustomPtr\fR field of the entry points to a structure
 defining the new option type.
-See the section CUSTOM OPTION TYPES below for details.
+See the section \fBCUSTOM OPTION TYPES\fR below for details.
 .TP
 \fBTK_CONFIG_DOUBLE\fR
 The value must be an ASCII floating-point number in
@@ -264,7 +264,7 @@ The value must be an ASCII string identifying a font in a form
 suitable for passing to \fBTk_GetFont\fR.  The value is converted
 to a \fBTk_Font\fR by calling \fBTk_GetFont\fR and the result
 is stored in the target.
-If TK_CONFIG_NULL_OK is specified in \fIspecFlags\fR then the value
+If \fBTK_CONFIG_NULL_OK\fR is specified in \fIspecFlags\fR then the value
 may be an empty string, in which case the target will be set to NULL.
 If the previous value of the target
 wasn't NULL, then it is freed by passing it to \fBTk_FreeFont\fR.
@@ -314,7 +314,7 @@ A copy
 of the value is made by allocating memory space with
 \fBTcl_Alloc\fR and copying the value into the dynamically-allocated
 space.  A pointer to the new string is stored in the target.
-If TK_CONFIG_NULL_OK is specified in \fIspecFlags\fR then the value
+If \fBTK_CONFIG_NULL_OK\fR is specified in \fIspecFlags\fR then the value
 may be an empty string, in which case the target will be set to NULL.
 If the previous value of the target wasn't NULL, then it is
 freed by passing it to \fBTcl_Free\fR.
@@ -322,10 +322,10 @@ freed by passing it to \fBTcl_Free\fR.
 \fBTK_CONFIG_SYNONYM\fR
 This \fItype\fR value identifies special entries in \fIspecs\fR that
 are synonyms for other entries.  If an \fIargv\fR value matches the
-\fIargvName\fR of a TK_CONFIG_SYNONYM entry, the entry isn't used
+\fIargvName\fR of a \fBTK_CONFIG_SYNONYM\fR entry, the entry isn't used
 directly. Instead, \fBTk_ConfigureWidget\fR searches \fIspecs\fR
 for another entry whose \fIargvName\fR is the same as the \fIdbName\fR
-field in the TK_CONFIG_SYNONYM entry;  this new entry is used just
+field in the \fBTK_CONFIG_SYNONYM\fR entry;  this new entry is used just
 as if its \fIargvName\fR had matched the \fIargv\fR value.  The
 synonym mechanism allows multiple \fIargv\fR values to be used for
 a single configuration option, such as ``\-background'' and ``\-bg''.
@@ -334,7 +334,7 @@ a single configuration option, such as ``\-background'' and ``\-bg''.
 The value is translated to a \fBTk_Uid\fR
 (by passing it to \fBTk_GetUid\fR).  The resulting value
 is stored in the target.
-If TK_CONFIG_NULL_OK is specified in \fIspecFlags\fR and the value
+If \fBTK_CONFIG_NULL_OK\fR is specified in \fIspecFlags\fR and the value
 is an empty string then the target will be set to NULL.
 .TP
 \fBTK_CONFIG_WINDOW\fR
@@ -346,8 +346,8 @@ The value must be a window path name.  It is translated to a
 In some cases it is useful to generate multiple resources from
 a single configuration value.  For example, a color name might
 be used both to generate the background color for a widget (using
-TK_CONFIG_COLOR) and to generate a 3-D border to draw around the
-widget (using TK_CONFIG_BORDER).  In cases like this it is possible
+\fBTK_CONFIG_COLOR\fR) and to generate a 3-D border to draw around the
+widget (using \fBTK_CONFIG_BORDER\fR).  In cases like this it is possible
 to specify that several consecutive entries in \fIspecs\fR are to
 be treated as a group.  The first entry is used to determine a value
 (using its \fIargvName\fR, \fIdbName\fR,
@@ -368,7 +368,7 @@ options.  These values are used in three different ways as
 described below.
 .PP
 First, if the \fIflags\fR argument to \fBTk_ConfigureWidget\fR has
-the TK_CONFIG_ARGV_ONLY bit set (i.e., \fIflags\fR | TK_CONFIG_ARGV_ONLY != 0),
+the \fBTK_CONFIG_ARGV_ONLY\fR bit set (i.e., \fIflags\fR | \fBTK_CONFIG_ARGV_ONLY\fR != 0),
 then the option database and
 \fIdefValue\fR fields are not used.  In this case, if an entry in
 \fIspecs\fR doesn't match a field in \fIargv\fR then nothing happens:
@@ -424,14 +424,14 @@ It will be zero in all other entries.
 This bit provides a way for clients to determine which values
 actually changed in a call to \fBTk_ConfigureWidget\fR.
 .PP
-The TK_CONFIG_MONO_ONLY and TK_CONFIG_COLOR_ONLY flags are typically
+The \fBTK_CONFIG_MONO_ONLY\fR and \fBTK_CONFIG_COLOR_ONLY\fR flags are typically
 used to specify different default values for
 monochrome and color displays.  This is done by creating two
 entries in \fIspecs\fR that are identical except for their
 \fIdefValue\fR and \fIspecFlags\fR fields.  One entry should have
-the value TK_CONFIG_MONO_ONLY in its \fIspecFlags\fR and the
+the value \fBTK_CONFIG_MONO_ONLY\fR in its \fIspecFlags\fR and the
 default value for monochrome displays in its \fIdefValue\fR;  the
-other entry should have the value TK_CONFIG_COLOR_ONLY in
+other entry should have the value \fBTK_CONFIG_COLOR_ONLY\fR in
 its \fIspecFlags\fR and the appropriate \fIdefValue\fR for
 color displays.
 .PP
@@ -443,7 +443,7 @@ a single \fIspecs\fR table to be created with all the configuration
 options for all the widget types.  When processing a particular
 widget type, only entries relevant to that type will be used.  This
 effect is achieved by setting the high-order bits (those in positions
-equal to or greater than TK_CONFIG_USER_BIT) in \fIspecFlags\fR
+equal to or greater than \fBTK_CONFIG_USER_BIT\fR) in \fIspecFlags\fR
 values or in \fIflags\fR.  In order for a particular entry in
 \fIspecs\fR to be used, its high-order bits must match exactly
 the high-order bits of the \fIflags\fR value passed to
@@ -475,7 +475,7 @@ a widget (\fIwidgRec\fR), and a NULL \fIargvName\fR argument,
 \fBTk_ConfigureInfo\fR generates a string describing all of the
 configuration options for the window.  The string is placed
 in \fIinterp->result\fR.  Under normal circumstances
-it returns TCL_OK;  if an error occurs then it returns TCL_ERROR
+it returns \fBTCL_OK\fR;  if an error occurs then it returns \fBTCL_ERROR\fR
 and \fIinterp->result\fR contains an error message.
 .PP
 If \fIargvName\fR is NULL, then the value left in
@@ -483,7 +483,7 @@ If \fIargvName\fR is NULL, then the value left in
 consists of a list of one or more entries, each of which describes
 one configuration option (i.e. one entry in \fIspecs\fR).  Each
 entry in the list will contain either two or five values.  If the
-corresponding entry in \fIspecs\fR has type TK_CONFIG_SYNONYM, then
+corresponding entry in \fIspecs\fR has type \fBTK_CONFIG_SYNONYM\fR, then
 the list will contain two values:  the \fIargvName\fR for the entry
 and the \fIdbName\fR (synonym name).  Otherwise the list will contain
 five values:  \fIargvName\fR, \fIdbName\fR, \fIdbClass\fR, \fIdefValue\fR,
@@ -505,10 +505,10 @@ the \fIspecs\fR entries to consider, just as for \fBTk_ConfigureWidget\fR.
 \fBTk_ConfigureValue\fR takes arguments similar to \fBTk_ConfigureInfo\fR;
 instead of returning a list of values, it just returns the current value
 of the option given by \fIargvName\fR (\fIargvName\fR must not be NULL).
-The value is returned in \fIinterp->result\fR and TCL_OK is
+The value is returned in \fIinterp->result\fR and \fBTCL_OK\fR is
 normally returned as the procedure's result.
 If an error occurs in \fBTk_ConfigureValue\fR (e.g., \fIargvName\fR is
-not a valid option name), TCL_ERROR is returned and an error message
+not a valid option name), \fBTCL_ERROR\fR is returned and an error message
 is left in \fIinterp->result\fR.
 This procedure is typically called to implement \fBcget\fR widget
 commands.
@@ -519,7 +519,7 @@ The \fBTk_FreeOptions\fR procedure may be invoked during widget cleanup
 to release all of the resources associated with configuration options.
 It scans through \fIspecs\fR and for each entry corresponding to a
 resource that must be explicitly freed (e.g. those with
-type TK_CONFIG_COLOR), it frees the resource in the widget record.
+type \fBTK_CONFIG_COLOR\fR), it frees the resource in the widget record.
 If the field in the widget record doesn't refer to a resource (e.g.
 it contains a null pointer) then no resource is freed for that
 entry.
@@ -533,25 +533,25 @@ configuration types by writing procedures to parse and print options
 of the a type and creating a structure pointing to those procedures:
 .CS
 typedef struct Tk_CustomOption {
-	Tk_OptionParseProc *\fIparseProc\fR;
-	Tk_OptionPrintProc *\fIprintProc\fR;
-	ClientData \fIclientData\fR;
+    Tk_OptionParseProc *\fIparseProc\fR;
+    Tk_OptionPrintProc *\fIprintProc\fR;
+    ClientData \fIclientData\fR;
 } Tk_CustomOption;
 
 typedef int Tk_OptionParseProc(
-	ClientData \fIclientData\fR,
-	Tcl_Interp *\fIinterp\fR,
-	Tk_Window \fItkwin\fR,
-	char *\fIvalue\fR,
-	char *\fIwidgRec\fR,
-	int \fIoffset\fR);
+    ClientData \fIclientData\fR,
+    Tcl_Interp *\fIinterp\fR,
+    Tk_Window \fItkwin\fR,
+    char *\fIvalue\fR,
+    char *\fIwidgRec\fR,
+    int \fIoffset\fR);
 
 typedef char *Tk_OptionPrintProc(
-	ClientData \fIclientData\fR,
-	Tk_Window \fItkwin\fR,
-	char *\fIwidgRec\fR,
-	int \fIoffset\fR,
-	Tcl_FreeProc **\fIfreeProcPtr\fR);
+    ClientData \fIclientData\fR,
+    Tk_Window \fItkwin\fR,
+    char *\fIwidgRec\fR,
+    int \fIoffset\fR,
+    Tcl_FreeProc **\fIfreeProcPtr\fR);
 .CE
 The Tk_CustomOption structure contains three fields, which are pointers
 to the two procedures and a \fIclientData\fR value to be passed to those
@@ -579,8 +579,8 @@ The last argument, \fIoffset\fR, gives the offset in bytes from the start
 of the widget record to the location where the option value is to
 be placed.  The procedure should translate the string to whatever
 form is appropriate for the option and store the value in the widget
-record.  It should normally return TCL_OK, but if an error occurs
-in translating the string to a value then it should return TCL_ERROR
+record.  It should normally return \fBTCL_OK\fR, but if an error occurs
+in translating the string to a value then it should return \fBTCL_ERROR\fR
 and store an error message in \fIinterp->result\fR.
 .PP
 The \fIprintProc\fR procedure is called
@@ -602,7 +602,7 @@ need not do anything with the \fIfreeProcPtr\fR argument.
 Once \fIparseProc\fR and \fIprintProc\fR have been defined and a
 Tk_CustomOption structure has been created for them, options of this
 new type may be manipulated with Tk_ConfigSpec entries whose \fItype\fR
-fields are TK_CONFIG_CUSTOM and whose \fIcustomPtr\fR fields point
+fields are \fBTK_CONFIG_CUSTOM\fR and whose \fIcustomPtr\fR fields point
 to the Tk_CustomOption structure.
 
 .SH EXAMPLES
diff --git a/doc/CrtCmHdlr.3 b/doc/CrtCmHdlr.3
index f64e79b..7c050ec 100644
--- a/doc/CrtCmHdlr.3
+++ b/doc/CrtCmHdlr.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: CrtCmHdlr.3,v 1.1 2000/06/03 08:57:34 hobbs Exp $
+'\" RCS: @(#) $Id: CrtCmHdlr.3,v 1.2 2004/09/19 16:05:36 dkf Exp $
 '\" 
 .so man.macros
 .TH Tk_CreateClientMessageHandler 3 "8.4" Tk "Tk Library Procedures"
@@ -42,8 +42,8 @@ call \fBTk_HandleEvent\fR, such as \fBTk_DoOneEvent\fR or
 type \fBTk_ClientMessageProc\fR:
 .CS
 typedef int Tk_ClientMessageProc(
-	Tk_Window \fItkwin\fR,
-	XEvent *\fIeventPtr\fR);
+    Tk_Window \fItkwin\fR,
+    XEvent *\fIeventPtr\fR);
 .CE
 The \fItkwin\fR parameter to \fIproc\fR is the Tk window which is
 associated with this event.  \fIEventPtr\fR is a pointer to the X event.
diff --git a/doc/CrtErrHdlr.3 b/doc/CrtErrHdlr.3
index bde4f14..3cf7ba1 100644
--- a/doc/CrtErrHdlr.3
+++ b/doc/CrtErrHdlr.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: CrtErrHdlr.3,v 1.2 1998/09/14 18:22:46 stanton Exp $
+'\" RCS: @(#) $Id: CrtErrHdlr.3,v 1.3 2004/09/19 16:05:36 dkf Exp $
 '\" 
 .so man.macros
 .TH Tk_CreateErrorHandler 3 "" Tk "Tk Library Procedures"
@@ -76,8 +76,8 @@ made when the handler was active (see below for more information).
 following type:
 .CS
 typedef int Tk_ErrorProc(
-	ClientData \fIclientData\fR,
-	XErrorEvent *\fIerrEventPtr\fR);
+    ClientData \fIclientData\fR,
+    XErrorEvent *\fIerrEventPtr\fR);
 .CE
 The \fIclientData\fR parameter to \fIproc\fR is a copy of the \fIclientData\fR
 argument given to \fBTcl_CreateErrorHandler\fR when the callback
diff --git a/doc/CrtGenHdlr.3 b/doc/CrtGenHdlr.3
index be761b6..d31f463 100644
--- a/doc/CrtGenHdlr.3
+++ b/doc/CrtGenHdlr.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: CrtGenHdlr.3,v 1.2 1998/09/14 18:22:46 stanton Exp $
+'\" RCS: @(#) $Id: CrtGenHdlr.3,v 1.3 2004/09/19 16:05:36 dkf Exp $
 '\" 
 .so man.macros
 .TH Tk_CreateGenericHandler 3 "" Tk "Tk Library Procedures"
@@ -48,8 +48,8 @@ call \fBTk_HandleEvent\fR, such as \fBTk_DoOneEvent\fR or
 type \fBTk_GenericProc\fR:
 .CS
 typedef int Tk_GenericProc(
-	ClientData \fIclientData\fR,
-	XEvent *\fIeventPtr\fR);
+    ClientData \fIclientData\fR,
+    XEvent *\fIeventPtr\fR);
 .CE
 The \fIclientData\fR parameter to \fIproc\fR is a copy of the \fIclientData\fR
 argument given to \fBTk_CreateGenericHandler\fR when the callback
diff --git a/doc/CrtImgType.3 b/doc/CrtImgType.3
index 6c58fca..5f87b98 100644
--- a/doc/CrtImgType.3
+++ b/doc/CrtImgType.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: CrtImgType.3,v 1.7 2003/12/10 09:42:17 dkf Exp $
+'\" RCS: @(#) $Id: CrtImgType.3,v 1.8 2004/09/19 16:05:36 dkf Exp $
 '\" 
 .so man.macros
 .TH Tk_CreateImageType 3 8.3 Tk "Tk Library Procedures"
@@ -63,12 +63,12 @@ the name of the image type and pointers to five procedures provided
 by the image manager to deal with images of this type:
 .CS
 typedef struct Tk_ImageType {
-	char *\fIname\fR;
-	Tk_ImageCreateProc *\fIcreateProc\fR;
-	Tk_ImageGetProc *\fIgetProc\fR;
-	Tk_ImageDisplayProc *\fIdisplayProc\fR;
-	Tk_ImageFreeProc *\fIfreeProc\fR;
-	Tk_ImageDeleteProc *\fIdeleteProc\fR;
+    char *\fIname\fR;
+    Tk_ImageCreateProc *\fIcreateProc\fR;
+    Tk_ImageGetProc *\fIgetProc\fR;
+    Tk_ImageDisplayProc *\fIdisplayProc\fR;
+    Tk_ImageFreeProc *\fIfreeProc\fR;
+    Tk_ImageDeleteProc *\fIdeleteProc\fR;
 } Tk_ImageType;
 .CE
 The fields of this structure will be described in later subsections
@@ -97,7 +97,7 @@ option specified for a widget or canvas item.
 The following subsections describe the fields of a Tk_ImageType
 in more detail.
 
-.SH NAME
+.SS NAME
 .PP
 \fItypePtr->name\fR provides a name for the image type.
 Once \fBTk_CreateImageType\fR returns, this name may be used
@@ -106,7 +106,7 @@ type.
 If there already existed an image type by this name then
 the new image type replaces the old one.
 
-.SH PORTABILITY
+.SS PORTABILITY
 .PP
 In Tk 8.2 and earlier, the createProc below had a different
 signature. If you want to compile an image type using the
@@ -116,20 +116,20 @@ you are using Stubs, you need to call the function
 Tk_InitImageArgs(interp, argc, &argv) first in your
 createProc. See below for a description of this function.
 
-.SH CREATEPROC
+.SS CREATEPROC
 \fItypePtr->createProc\fR provides the address of a procedure for
 Tk to call whenever \fBimage create\fR is invoked to create
 an image of the new type.
 \fItypePtr->createProc\fR must match the following prototype:
 .CS
 typedef int Tk_ImageCreateProc(
-	Tcl_Interp *\fIinterp\fR,
-	char *\fIname\fR,
-	int \fIobjc\fR,
-	Tcl_Obj *CONST \fIobjv\fR[],
-	Tk_ImageType *\fItypePtr\fR,
-	Tk_ImageMaster \fImaster\fR,
-	ClientData *\fImasterDataPtr\fR);
+    Tcl_Interp *\fIinterp\fR,
+    char *\fIname\fR,
+    int \fIobjc\fR,
+    Tcl_Obj *CONST \fIobjv\fR[],
+    Tk_ImageType *\fItypePtr\fR,
+    Tk_ImageMaster \fImaster\fR,
+    ClientData *\fImasterDataPtr\fR);
 .CE
 The \fIinterp\fR argument is the interpreter in which the \fBimage\fR
 command was invoked, and \fIname\fR is the name for the new image,
@@ -156,15 +156,15 @@ it should return \fBTCL_OK\fR.
 \fIcreateProc\fR should call \fBTk_ImageChanged\fR in order to set the
 size of the image and request an initial redisplay.
 
-.SH GETPROC
+.SS GETPROC
 .PP
 \fItypePtr->getProc\fR is invoked by Tk whenever a widget
 calls \fBTk_GetImage\fR to use a particular image.
 This procedure must match the following prototype:
 .CS
 typedef ClientData Tk_ImageGetProc(
-	Tk_Window \fItkwin\fR,
-	ClientData \fImasterData\fR);
+    Tk_Window \fItkwin\fR,
+    ClientData \fImasterData\fR);
 .CE
 The \fItkwin\fR argument identifies the window in which the
 image will be used and \fImasterData\fR is the value
@@ -177,22 +177,22 @@ is typically the address of the instance data structure.
 Tk will pass this value back to the image manager when invoking
 its \fIdisplayProc\fR and \fIfreeProc\fR procedures.
 
-.SH DISPLAYPROC
+.SS DISPLAYPROC
 .PP
 \fItypePtr->displayProc\fR is invoked by Tk whenever an image needs
 to be displayed (i.e., whenever a widget calls \fBTk_RedrawImage\fR).
 \fIdisplayProc\fR must match the following prototype:
 .CS
 typedef void Tk_ImageDisplayProc(
-	ClientData \fIinstanceData\fR,
-	Display *\fIdisplay\fR,
-	Drawable \fIdrawable\fR,
-	int \fIimageX\fR,
-	int \fIimageY\fR,
-	int \fIwidth\fR,
-	int \fIheight\fR,
-	int \fIdrawableX\fR,
-	int \fIdrawableY\fR);
+    ClientData \fIinstanceData\fR,
+    Display *\fIdisplay\fR,
+    Drawable \fIdrawable\fR,
+    int \fIimageX\fR,
+    int \fIimageY\fR,
+    int \fIwidth\fR,
+    int \fIheight\fR,
+    int \fIdrawableX\fR,
+    int \fIdrawableY\fR);
 .CE
 The \fIinstanceData\fR will be the same as the value returned by
 \fIgetProc\fR when the instance was created.
@@ -210,7 +210,7 @@ the image should be displayed;  \fIdisplayProc\fR should display
 the given region of the image so that point (\fIimageX\fR, \fIimageY\fR)
 in the image appears at (\fIdrawableX\fR, \fIdrawableY\fR) in \fIdrawable\fR.
 
-.SH FREEPROC
+.SS FREEPROC
 .PP
 \fItypePtr->freeProc\fR contains the address of a procedure that
 Tk will invoke when an image instance is released (i.e., when
@@ -221,8 +221,8 @@ canvas item is changed.
 \fIfreeProc\fR must match the following prototype:
 .CS
 typedef void Tk_ImageFreeProc(
-	ClientData \fIinstanceData\fR,
-	Display *\fIdisplay\fR);
+    ClientData \fIinstanceData\fR,
+    Display *\fIdisplay\fR);
 .CE
 The \fIinstanceData\fR will be the same as the value returned by
 \fIgetProc\fR when the instance was created, and \fIdisplay\fR
@@ -230,7 +230,7 @@ is the display containing the window for the instance.
 \fIfreeProc\fR should release any resources associated with the
 image instance, since the instance will never be used again.
 
-.SH DELETEPROC
+.SS DELETEPROC
 .PP
 \fItypePtr->deleteProc\fR is a procedure that Tk invokes when an
 image is being deleted (i.e. when the \fBimage delete\fR command
@@ -240,7 +240,7 @@ each of the image's instances.
 \fIdeleteProc\fR must match the following prototype:
 .CS
 typedef void Tk_ImageDeleteProc(
-	ClientData \fImasterData\fR);
+    ClientData \fImasterData\fR);
 .CE
 The \fImasterData\fR argument will be the same as the value
 stored in \fI*masterDataPtr\fR by \fIcreateProc\fR when the
diff --git a/doc/CrtItemType.3 b/doc/CrtItemType.3
index 985c2b4..69f2d6a 100644
--- a/doc/CrtItemType.3
+++ b/doc/CrtItemType.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: CrtItemType.3,v 1.7 2004/08/22 15:43:20 dkf Exp $
+'\" RCS: @(#) $Id: CrtItemType.3,v 1.8 2004/09/19 16:05:36 dkf Exp $
 '\" 
 .so man.macros
 .TH Tk_CreateItemType 3 4.0 Tk "Tk Library Procedures"
@@ -66,26 +66,26 @@ information such as the name of the type and pointers to
 the standard procedures implemented by the type manager:
 .CS
 typedef struct Tk_ItemType {
-	char *\fIname\fR;
-	int \fIitemSize\fR;
-	Tk_ItemCreateProc *\fIcreateProc\fR;
-	Tk_ConfigSpec *\fIconfigSpecs\fR;
-	Tk_ItemConfigureProc *\fIconfigProc\fR;
-	Tk_ItemCoordProc *\fIcoordProc\fR;
-	Tk_ItemDeleteProc *\fIdeleteProc\fR;
-	Tk_ItemDisplayProc *\fIdisplayProc\fR;
-	int \fIalwaysRedraw\fR;
-	Tk_ItemPointProc *\fIpointProc\fR;
-	Tk_ItemAreaProc *\fIareaProc\fR;
-	Tk_ItemPostscriptProc *\fIpostscriptProc\fR;
-	Tk_ItemScaleProc *\fIscaleProc\fR;
-	Tk_ItemTranslateProc *\fItranslateProc\fR;
-	Tk_ItemIndexProc *\fIindexProc\fR;
-	Tk_ItemCursorProc *\fIicursorProc\fR;
-	Tk_ItemSelectionProc *\fIselectionProc\fR;
-	Tk_ItemInsertProc *\fIinsertProc\fR;
-	Tk_ItemDCharsProc *\fIdCharsProc\fR;
-	Tk_ItemType *\fInextPtr\fR;
+    char *\fIname\fR;
+    int \fIitemSize\fR;
+    Tk_ItemCreateProc *\fIcreateProc\fR;
+    Tk_ConfigSpec *\fIconfigSpecs\fR;
+    Tk_ItemConfigureProc *\fIconfigProc\fR;
+    Tk_ItemCoordProc *\fIcoordProc\fR;
+    Tk_ItemDeleteProc *\fIdeleteProc\fR;
+    Tk_ItemDisplayProc *\fIdisplayProc\fR;
+    int \fIalwaysRedraw\fR;
+    Tk_ItemPointProc *\fIpointProc\fR;
+    Tk_ItemAreaProc *\fIareaProc\fR;
+    Tk_ItemPostscriptProc *\fIpostscriptProc\fR;
+    Tk_ItemScaleProc *\fIscaleProc\fR;
+    Tk_ItemTranslateProc *\fItranslateProc\fR;
+    Tk_ItemIndexProc *\fIindexProc\fR;
+    Tk_ItemCursorProc *\fIicursorProc\fR;
+    Tk_ItemSelectionProc *\fIselectionProc\fR;
+    Tk_ItemInsertProc *\fIinsertProc\fR;
+    Tk_ItemDCharsProc *\fIdCharsProc\fR;
+    Tk_ItemType *\fInextPtr\fR;
 } Tk_ItemType;
 .CE
 .PP
@@ -113,13 +113,13 @@ the first field.
 For example, the item record for bitmap items is defined as follows:
 .CS
 typedef struct BitmapItem {
-	Tk_Item \fIheader\fR;
-	double \fIx\fR, \fIy\fR;
-	Tk_Anchor \fIanchor\fR;
-	Pixmap \fIbitmap\fR;
-	XColor *\fIfgColor\fR;
-	XColor *\fIbgColor\fR;
-	GC \fIgc\fR;
+    Tk_Item \fIheader\fR;
+    double \fIx\fR, \fIy\fR;
+    Tk_Anchor \fIanchor\fR;
+    Pixmap \fIbitmap\fR;
+    XColor *\fIfgColor\fR;
+    XColor *\fIbgColor\fR;
+    GC \fIgc\fR;
 } BitmapItem;
 .CE
 The \fIheader\fR substructure contains information used by Tk
@@ -182,11 +182,11 @@ Tk to call whenever a new item of this type is created.
 \fItypePtr->createProc\fR must match the following prototype:
 .CS
 typedef int Tk_ItemCreateProc(
-	Tcl_Interp *\fIinterp\fR,
-	Tk_Canvas \fIcanvas\fR,
-	Tk_Item *\fIitemPtr\fR,
-	int \fIobjc\fR,
-	Tcl_Obj* CONST \fIobjv\fR);
+    Tcl_Interp *\fIinterp\fR,
+    Tk_Canvas \fIcanvas\fR,
+    Tk_Item *\fIitemPtr\fR,
+    int \fIobjc\fR,
+    Tcl_Obj* CONST \fIobjv\fR);
 .CE
 The \fIinterp\fR argument is the interpreter in which the canvas's
 \fBcreate\fR widget command was invoked, and \fIcanvas\fR is a
@@ -238,12 +238,12 @@ configuration options for a canvas item.
 This procedure must match the following prototype:
 .CS
 typedef int Tk_ItemConfigureProc(
-	Tcl_Interp *\fIinterp\fR,
-	Tk_Canvas \fIcanvas\fR,
-	Tk_Item *\fIitemPtr\fR,
-	int \fIobjc\fR,
-	Tcl_Obj* CONST \fIobjv\fR,
-	int \fIflags\fR);
+    Tcl_Interp *\fIinterp\fR,
+    Tk_Canvas \fIcanvas\fR,
+    Tk_Item *\fIitemPtr\fR,
+    int \fIobjc\fR,
+    Tcl_Obj* CONST \fIobjv\fR,
+    int \fIflags\fR);
 .CE
 The \fIinterp\fR objument identifies the interpreter in which the
 widget command was invoked,  \fIcanvas\fR is a handle for the canvas
@@ -257,7 +257,7 @@ example, if the following command is invoked:
 through \fBblack\fR.
 \fIobjc\fR will always be an even value.
 The  \fIflags\fR argument contains flags to pass to \fBTk_ConfigureWidget\fR;
-currently this value is always TK_CONFIG_ARGV_ONLY when Tk
+currently this value is always \fBTK_CONFIG_ARGV_ONLY\fR when Tk
 invokes \fItypePtr->configProc\fR, but the type manager's \fIcreateProc\fR
 procedure will usually invoke \fIconfigProc\fR with different flag values.
 .PP
@@ -273,11 +273,11 @@ widget command for an item.
 It must match the following prototype:
 .CS
 typedef int Tk_ItemCoordProc(
-	Tcl_Interp *\fIinterp\fR,
-	Tk_Canvas \fIcanvas\fR,
-	Tk_Item *\fIitemPtr\fR,
-	int \fIobjc\fR,
-	Tcl_Obj* CONST \fIobjv\fR);
+    Tcl_Interp *\fIinterp\fR,
+    Tk_Canvas \fIcanvas\fR,
+    Tk_Item *\fIitemPtr\fR,
+    int \fIobjc\fR,
+    Tcl_Obj* CONST \fIobjv\fR);
 .CE
 The arguments \fIinterp\fR, \fIcanvas\fR, and \fIitemPtr\fR
 all have the standard meanings, and \fIobjc\fR and \fIobjv\fR
@@ -303,9 +303,9 @@ and free any resources allocated to it.
 It must match the following prototype:
 .CS
 typedef void Tk_ItemDeleteProc(
-	Tk_Canvas \fIcanvas\fR,
-	Tk_Item *\fIitemPtr\fR,
-	Display *\fIdisplay\fR);
+    Tk_Canvas \fIcanvas\fR,
+    Tk_Item *\fIitemPtr\fR,
+    Display *\fIdisplay\fR);
 .CE
 The \fIcanvas\fR and \fIitemPtr\fR arguments have the usual
 interpretations, and \fIdisplay\fR identifies the X display containing
@@ -322,14 +322,14 @@ on the screen.
 It must match the following prototype:
 .CS
 typedef void Tk_ItemDisplayProc(
-	Tk_Canvas \fIcanvas\fR,
-	Tk_Item *\fIitemPtr\fR,
-	Display *\fIdisplay\fR,
-	Drawable \fIdst\fR,
-	int \fIx\fR,
-	int \fIy\fR,
-	int \fIwidth\fR,
-	int \fIheight\fR);
+    Tk_Canvas \fIcanvas\fR,
+    Tk_Item *\fIitemPtr\fR,
+    Display *\fIdisplay\fR,
+    Drawable \fIdst\fR,
+    int \fIx\fR,
+    int \fIy\fR,
+    int \fIwidth\fR,
+    int \fIheight\fR);
 .CE
 The \fIcanvas\fR and \fIitemPtr\fR arguments have the usual meaning.
 \fIdisplay\fR identifies the display containing the canvas, and
@@ -368,9 +368,9 @@ under the mouse or finding the closest item to a given point.
 The procedure must match the following prototype:
 .CS
 typedef double Tk_ItemPointProc(
-	Tk_Canvas \fIcanvas\fR,
-	Tk_Item *\fIitemPtr\fR,
-	double *\fIpointPtr\fR);
+    Tk_Canvas \fIcanvas\fR,
+    Tk_Item *\fIitemPtr\fR,
+    double *\fIpointPtr\fR);
 .CE
 \fIcanvas\fR and \fIitemPtr\fR have the usual meaning.
 \fIpointPtr\fR points to an array of two numbers giving
@@ -386,9 +386,9 @@ between an item and a rectangular area.
 It must match the following prototype:
 .CS
 typedef int Tk_ItemAreaProc(
-	Tk_Canvas \fIcanvas\fR,
-	Tk_Item *\fIitemPtr\fR,
-	double *\fIrectPtr\fR);
+    Tk_Canvas \fIcanvas\fR,
+    Tk_Item *\fIitemPtr\fR,
+    double *\fIrectPtr\fR);
 .CE
 \fIcanvas\fR and \fIitemPtr\fR have the usual meaning.
 \fIrectPtr\fR points to an array of four real numbers;
@@ -408,20 +408,20 @@ If the type manager is not capable of generating Postscript then
 The procedure must match the following prototype:
 .CS
 typedef int Tk_ItemPostscriptProc(
-	Tcl_Interp *\fIinterp\fR,
-	Tk_Canvas \fIcanvas\fR,
-	Tk_Item *\fIitemPtr\fR,
-	int \fIprepass\fR);
+    Tcl_Interp *\fIinterp\fR,
+    Tk_Canvas \fIcanvas\fR,
+    Tk_Item *\fIitemPtr\fR,
+    int \fIprepass\fR);
 .CE
 The \fIinterp\fR, \fIcanvas\fR, and \fIitemPtr\fR arguments all have
 standard meanings;  \fIprepass\fR will be described below.
 If \fIpostscriptProc\fR completes successfully, it should append
 Postscript for the item to the information in \fIinterp->result\fR
 (e.g. by calling \fBTcl_AppendResult\fR, not \fBTcl_SetResult\fR)
-and return TCL_OK.
+and return \fBTCL_OK\fR.
 If an error occurs, \fIpostscriptProc\fR should clear the result
 and replace its contents with an error message;  then it should
-return TCL_ERROR.
+return \fBTCL_ERROR\fR.
 .PP
 Tk provides a collection of utility procedures to simplify
 \fIpostscriptProc\fR.
@@ -456,12 +456,12 @@ during the \fBscale\fR widget command.
 The procedure must match the following prototype:
 .CS
 typedef void Tk_ItemScaleProc(
-	Tk_Canvas \fIcanvas\fR,
-	Tk_Item *\fIitemPtr\fR,
-	double \fIoriginX\fR,
-	double \fIoriginY\fR,
-	double \fIscaleX\fR,
-	double \fIscaleY\fR);
+    Tk_Canvas \fIcanvas\fR,
+    Tk_Item *\fIitemPtr\fR,
+    double \fIoriginX\fR,
+    double \fIoriginY\fR,
+    double \fIscaleX\fR,
+    double \fIscaleY\fR);
 .CE
 The \fIcanvas\fR and \fIitemPtr\fR arguments have the usual meaning.
 \fIoriginX\fR and \fIoriginY\fR specify an origin relative to which
@@ -483,10 +483,10 @@ during the \fBmove\fR widget command.
 The procedure must match the following prototype:
 .CS
 typedef void Tk_ItemTranslateProc(
-	Tk_Canvas \fIcanvas\fR,
-	Tk_Item *\fIitemPtr\fR,
-	double \fIdeltaX\fR,
-	double \fIdeltaY\fR);
+    Tk_Canvas \fIcanvas\fR,
+    Tk_Item *\fIitemPtr\fR,
+    double \fIdeltaX\fR,
+    double \fIdeltaY\fR);
 .CE
 The \fIcanvas\fR and \fIitemPtr\fR arguments have the usual meaning,
 and \fIdeltaX\fR and \fIdeltaY\fR give the amounts that should be
@@ -504,11 +504,11 @@ item types.
 The procedure must match the following prototype:
 .CS
 typedef int Tk_ItemIndexProc(
-	Tcl_Interp *\fIinterp\fR,
-	Tk_Canvas \fIcanvas\fR,
-	Tk_Item *\fIitemPtr\fR,
-	char \fIindexString\fR,
-	int *\fIindexPtr\fR);
+    Tcl_Interp *\fIinterp\fR,
+    Tk_Canvas \fIcanvas\fR,
+    Tk_Item *\fIitemPtr\fR,
+    char \fIindexString\fR,
+    int *\fIindexPtr\fR);
 .CE
 The \fIinterp\fR, \fIcanvas\fR, and \fIitemPtr\fR arguments all
 have the usual meaning.
@@ -532,9 +532,9 @@ that don't support an insertion cursor.
 The procedure must match the following prototype:
 .CS
 typedef void Tk_ItemCursorProc(
-	Tk_Canvas \fIcanvas\fR,
-	Tk_Item *\fIitemPtr\fR,
-	int \fIindex\fR);
+    Tk_Canvas \fIcanvas\fR,
+    Tk_Item *\fIitemPtr\fR,
+    int \fIindex\fR);
 .CE
 \fIcanvas\fR and \fIitemPtr\fR have the usual meanings, and
 \fIindex\fR is an index into the item's text, as returned by a
@@ -555,11 +555,11 @@ item types.
 The procedure must match the following prototype:
 .CS
 typedef int Tk_ItemSelectionProc(
-	Tk_Canvas \fIcanvas\fR,
-	Tk_Item *\fIitemPtr\fR,
-	int \fIoffset\fR,
-	char *\fIbuffer\fR,
-	int \fImaxBytes\fR);
+    Tk_Canvas \fIcanvas\fR,
+    Tk_Item *\fIitemPtr\fR,
+    int \fIoffset\fR,
+    char *\fIbuffer\fR,
+    int \fImaxBytes\fR);
 .CE
 \fIcanvas\fR and \fIitemPtr\fR have the usual meanings.
 \fIoffset\fR is an offset in bytes into the selection where 0 refers
@@ -585,10 +585,10 @@ item types.
 The procedure must match the following prototype:
 .CS
 typedef void Tk_ItemInsertProc(
-	Tk_Canvas \fIcanvas\fR,
-	Tk_Item *\fIitemPtr\fR,
-	int \fIindex\fR,
-	char *\fIstring\fR);
+    Tk_Canvas \fIcanvas\fR,
+    Tk_Item *\fIitemPtr\fR,
+    int \fIindex\fR,
+    char *\fIstring\fR);
 .CE
 \fIcanvas\fR and \fIitemPtr\fR have the usual meanings.
 \fIindex\fR is an index into the item's text, as returned by a
@@ -608,10 +608,10 @@ item types.
 The procedure must match the following prototype:
 .CS
 typedef void Tk_ItemDCharsProc(
-	Tk_Canvas \fIcanvas\fR,
-	Tk_Item *\fIitemPtr\fR,
-	int \fIfirst\fR,
-	int \fIlast\fR);
+    Tk_Canvas \fIcanvas\fR,
+    Tk_Item *\fIitemPtr\fR,
+    int \fIfirst\fR,
+    int \fIlast\fR);
 .CE
 \fIcanvas\fR and \fIitemPtr\fR have the usual meanings.
 \fIfirst\fR and \fIlast\fR give the indices of the first and last bytes
diff --git a/doc/CrtPhImgFmt.3 b/doc/CrtPhImgFmt.3
index 1b23eff..49cb65e 100644
--- a/doc/CrtPhImgFmt.3
+++ b/doc/CrtPhImgFmt.3
@@ -9,7 +9,7 @@
 '\"	    Department of Computer Science,
 '\"	    Australian National University.
 '\"
-'\" RCS: @(#) $Id: CrtPhImgFmt.3,v 1.5 2001/08/23 19:11:22 hobbs Exp $
+'\" RCS: @(#) $Id: CrtPhImgFmt.3,v 1.6 2004/09/19 16:05:36 dkf Exp $
 '\"
 .so man.macros
 .TH Tk_CreatePhotoImageFormat 3 8.3 Tk "Tk Library Procedures"
@@ -48,13 +48,13 @@ handler to deal with files and strings in this format.  The
 Tk_PhotoImageFormat structure contains the following fields:
 .CS
 typedef struct Tk_PhotoImageFormat {
-	char *\fIname\fR;
-	Tk_ImageFileMatchProc *\fIfileMatchProc\fR;
-	Tk_ImageStringMatchProc *\fIstringMatchProc\fR;
-	Tk_ImageFileReadProc *\fIfileReadProc\fR;
-	Tk_ImageStringReadProc *\fIstringReadProc\fR;
-	Tk_ImageFileWriteProc *\fIfileWriteProc\fR;
-	Tk_ImageStringWriteProc *\fIstringWriteProc\fR;
+    char *\fIname\fR;
+    Tk_ImageFileMatchProc *\fIfileMatchProc\fR;
+    Tk_ImageStringMatchProc *\fIstringMatchProc\fR;
+    Tk_ImageFileReadProc *\fIfileReadProc\fR;
+    Tk_ImageStringReadProc *\fIstringReadProc\fR;
+    Tk_ImageFileWriteProc *\fIfileWriteProc\fR;
+    Tk_ImageStringWriteProc *\fIstringWriteProc\fR;
 } Tk_PhotoImageFormat;
 .CE
 .PP
@@ -94,12 +94,12 @@ suitable for reading data in a given file.
 \fIformatPtr->fileMatchProc\fR must match the following prototype:
 .CS
 typedef int Tk_ImageFileMatchProc(
-	Tcl_Channel \fIchan\fR,
-	CONST char *\fIfileName\fR,
-	Tcl_Obj *\fIformat\fR,
-	int *\fIwidthPtr\fR,
-	int *\fIheightPtr\fR,
-	Tcl_Interp *\fIinterp\fR);
+    Tcl_Channel \fIchan\fR,
+    CONST char *\fIfileName\fR,
+    Tcl_Obj *\fIformat\fR,
+    int *\fIwidthPtr\fR,
+    int *\fIheightPtr\fR,
+    Tcl_Interp *\fIinterp\fR);
 .CE
 The \fIfileName\fR argument is the name of the file containing the
 image data, which is open for reading as \fIchan\fR.  The
@@ -117,11 +117,11 @@ suitable for reading data from a given string.
 \fIformatPtr->stringMatchProc\fR must match the following prototype:
 .CS
 typedef int Tk_ImageStringMatchProc(
-	Tcl_Obj *\fIdata\fR,
-	Tcl_Obj *\fIformat\fR,
-	int *\fIwidthPtr\fR,
-	int *\fIheightPtr\fR,
-	Tcl_Interp *\fIinterp\fR);
+    Tcl_Obj *\fIdata\fR,
+    Tcl_Obj *\fIformat\fR,
+    int *\fIwidthPtr\fR,
+    int *\fIheightPtr\fR,
+    Tcl_Interp *\fIinterp\fR);
 .CE
 The \fIdata\fR argument points to the object containing the image
 data.  The \fIformat\fR argument contains the value given for
@@ -138,14 +138,14 @@ Tk to call to read data from an image file into a photo image.
 \fIformatPtr->fileReadProc\fR must match the following prototype:
 .CS
 typedef int Tk_ImageFileReadProc(
-	Tcl_Interp *\fIinterp\fR,
-	Tcl_Channel \fIchan\fR,
-	CONST char *\fIfileName\fR,
-	Tcl_Obj *\fIformat\fR,
-	PhotoHandle \fIimageHandle\fR,
-	int \fIdestX\fR, int \fIdestY\fR,
-	int \fIwidth\fR, int \fIheight\fR,
-	int \fIsrcX\fR, int \fIsrcY\fR);
+    Tcl_Interp *\fIinterp\fR,
+    Tcl_Channel \fIchan\fR,
+    CONST char *\fIfileName\fR,
+    Tcl_Obj *\fIformat\fR,
+    PhotoHandle \fIimageHandle\fR,
+    int \fIdestX\fR, int \fIdestY\fR,
+    int \fIwidth\fR, int \fIheight\fR,
+    int \fIsrcX\fR, int \fIsrcY\fR);
 .CE
 The \fIinterp\fR argument is the interpreter in which the command was
 invoked to read the image; it should be used for reporting errors.
@@ -167,13 +167,13 @@ Tk to call to read data from a string into a photo image.
 \fIformatPtr->stringReadProc\fR must match the following prototype:
 .CS
 typedef int Tk_ImageStringReadProc(
-	Tcl_Interp *\fIinterp\fR,
-	Tcl_Obj *\fIdata\fR,
-	Tcl_Obj *\fIformat\fR,
-	PhotoHandle \fIimageHandle\fR,
-	int \fIdestX\fR, int \fIdestY\fR,
-	int \fIwidth\fR, int \fIheight\fR,
-	int \fIsrcX\fR, int \fIsrcY\fR);
+    Tcl_Interp *\fIinterp\fR,
+    Tcl_Obj *\fIdata\fR,
+    Tcl_Obj *\fIformat\fR,
+    PhotoHandle \fIimageHandle\fR,
+    int \fIdestX\fR, int \fIdestY\fR,
+    int \fIwidth\fR, int \fIheight\fR,
+    int \fIsrcX\fR, int \fIsrcY\fR);
 .CE
 The \fIinterp\fR argument is the interpreter in which the command was
 invoked to read the image; it should be used for reporting errors.
@@ -195,10 +195,10 @@ Tk to call to write data from a photo image to a file.
 \fIformatPtr->fileWriteProc\fR must match the following prototype:
 .CS
 typedef int Tk_ImageFileWriteProc(
-	Tcl_Interp *\fIinterp\fR,
-	CONST char *\fIfileName\fR,
-	Tcl_Obj *\fIformat\fR,
-	Tk_PhotoImageBlock *\fIblockPtr\fR);
+    Tcl_Interp *\fIinterp\fR,
+    CONST char *\fIfileName\fR,
+    Tcl_Obj *\fIformat\fR,
+    Tk_PhotoImageBlock *\fIblockPtr\fR);
 .CE
 The \fIinterp\fR argument is the interpreter in which the command was
 invoked to write the image; it should be used for reporting errors.
@@ -220,9 +220,9 @@ Tk to call to translate image data from a photo image into a string.
 \fIformatPtr->stringWriteProc\fR must match the following prototype:
 .CS
 typedef int Tk_ImageStringWriteProc(
-	Tcl_Interp *\fIinterp\fR,
-	Tcl_Obj *\fIformat\fR,
-	Tk_PhotoImageBlock *\fIblockPtr\fR);
+    Tcl_Interp *\fIinterp\fR,
+    Tcl_Obj *\fIformat\fR,
+    Tk_PhotoImageBlock *\fIblockPtr\fR);
 .CE
 The \fIinterp\fR argument is the interpreter in which the command was
 invoked to convert the image; it should be used for reporting errors.
diff --git a/doc/CrtSelHdlr.3 b/doc/CrtSelHdlr.3
index 0e801a4..ffb16ad 100644
--- a/doc/CrtSelHdlr.3
+++ b/doc/CrtSelHdlr.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: CrtSelHdlr.3,v 1.2 1998/09/14 18:22:47 stanton Exp $
+'\" RCS: @(#) $Id: CrtSelHdlr.3,v 1.3 2004/09/19 16:05:36 dkf Exp $
 '\" 
 .so man.macros
 .TH Tk_CreateSelHandler 3 4.0 Tk "Tk Library Procedures"
@@ -58,10 +58,10 @@ the selection.  The most common form is STRING.
 type \fBTk_SelectionProc\fR:
 .CS
 typedef int Tk_SelectionProc(
-	ClientData \fIclientData\fR,
-	int \fIoffset\fR,
-	char *\fIbuffer\fR,
-	int \fImaxBytes\fR);
+    ClientData \fIclientData\fR,
+    int \fIoffset\fR,
+    char *\fIbuffer\fR,
+    int \fImaxBytes\fR);
 .CE
 The \fIclientData\fR parameter to \fIproc\fR is a copy of the
 \fIclientData\fR argument given to \fBTk_CreateSelHandler\fR.
diff --git a/doc/EventHndlr.3 b/doc/EventHndlr.3
index 3c9968b..a553293 100644
--- a/doc/EventHndlr.3
+++ b/doc/EventHndlr.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: EventHndlr.3,v 1.4 1999/04/21 21:53:21 rjohnson Exp $
+'\" RCS: @(#) $Id: EventHndlr.3,v 1.5 2004/09/19 16:05:36 dkf Exp $
 '\" 
 .so man.macros
 .TH Tk_CreateEventHandler 3 "" Tk "Tk Library Procedures"
@@ -48,8 +48,8 @@ call \fBTk_HandleEvent\fR, such as \fBTk_DoOneEvent\fR or
 type \fBTk_EventProc\fR:
 .CS
 typedef void Tk_EventProc(
-	ClientData \fIclientData\fR,
-	XEvent *\fIeventPtr\fR);
+    ClientData \fIclientData\fR,
+    XEvent *\fIeventPtr\fR);
 .CE
 The \fIclientData\fR parameter to \fIproc\fR is a copy of the \fIclientData\fR
 argument given to \fBTk_CreateEventHandler\fR when the callback
diff --git a/doc/FindPhoto.3 b/doc/FindPhoto.3
index bebf5d8..1b8387b 100644
--- a/doc/FindPhoto.3
+++ b/doc/FindPhoto.3
@@ -9,7 +9,7 @@
 '\"	    Department of Computer Science,
 '\"	    Australian National University.
 '\"
-'\" RCS: @(#) $Id: FindPhoto.3,v 1.8 2003/11/21 17:10:39 dkf Exp $
+'\" RCS: @(#) $Id: FindPhoto.3,v 1.9 2004/09/19 16:05:36 dkf Exp $
 '\"
 .so man.macros
 .TH Tk_FindPhoto 3 8.0 Tk "Tk Library Procedures"
@@ -75,9 +75,9 @@ Specifies the width of the image area to be affected (for
 .AP int compRule in
 Specifies the compositing rule used when combining transparent pixels
 in a block of data with a photo image.  Must be one of
-TK_PHOTO_COMPOSITE_OVERLAY (which puts the block of data over the top
+\fBTK_PHOTO_COMPOSITE_OVERLAY\fR (which puts the block of data over the top
 of the existing photo image, with the previous contents showing
-through in the transparent bits) or TK_PHOTO_COMPOSITE_SET (which
+through in the transparent bits) or \fBTK_PHOTO_COMPOSITE_SET\fR (which
 discards the existing photo image contents in the rectangle covered by
 the data block.)
 .AP int height in
@@ -125,12 +125,12 @@ The \fIblock\fR parameter is a pointer to a
 \fBTk_PhotoImageBlock\fR structure, defined as follows:
 .CS
 typedef struct {
-	unsigned char *\fIpixelPtr\fR;
-	int \fIwidth\fR;
-	int \fIheight\fR;
-	int \fIpitch\fR;
-	int \fIpixelSize\fR;
-	int \fIoffset[4]\fR;
+    unsigned char *\fIpixelPtr\fR;
+    int \fIwidth\fR;
+    int \fIheight\fR;
+    int \fIpitch\fR;
+    int \fIpixelSize\fR;
+    int \fIoffset[4]\fR;
 } Tk_PhotoImageBlock;
 .CE
 The \fIpixelPtr\fR field points to the first pixel, that is, the
@@ -148,12 +148,12 @@ green and blue planes.
 .PP
 The \fIcompRule\fR parameter to \fBTk_PhotoPutBlock\fR specifies a
 compositing rule that says what to do with transparent pixels.  The
-value TK_PHOTO_COMPOSITE_OVERLAY says that the previous contents of
+value \fBTK_PHOTO_COMPOSITE_OVERLAY\fR says that the previous contents of
 the photo image should show through, and the value
-TK_PHOTO_COMPOSITE_SET says that the previous contents of the photo
+\fBTK_PHOTO_COMPOSITE_SET\fR says that the previous contents of the photo
 image should be completely ignored, and the values from the block be
 copied directly across.  The behavior in Tk8.3 and earlier was
-equivalent to having TK_PHOTO_COMPOSITE_OVERLAY as a compositing rule.
+equivalent to having \fBTK_PHOTO_COMPOSITE_OVERLAY\fR as a compositing rule.
 .PP
 The value given for the \fIwidth\fR and \fIheight\fR parameters to
 \fBTk_PhotoPutBlock\fR do not have to correspond to the values specified
@@ -164,8 +164,8 @@ These rules operate independently in the horizontal and vertical
 directions.
 .PP
 .VS 8.5
-\fBTk_PhotoPutBlock\fR normally returns TCL_OK, though if it cannot
-allocate sufficient memory to hold the resulting image, TCL_ERROR is
+\fBTk_PhotoPutBlock\fR normally returns \fBTCL_OK\fR, though if it cannot
+allocate sufficient memory to hold the resulting image, \fBTCL_ERROR\fR is
 returned instead and, if the \fIinterp\fR argument is non-NULL, an
 error message is placed in the interpreter's result.
 .VE 8.5
@@ -210,8 +210,8 @@ allowing the image to expand in many small increments as image blocks
 are supplied.
 .PP
 .VS 8.5
-\fBTk_PhotoExpand\fR normally returns TCL_OK, though if it cannot
-allocate sufficient memory to hold the resulting image, TCL_ERROR is
+\fBTk_PhotoExpand\fR normally returns \fBTCL_OK\fR, though if it cannot
+allocate sufficient memory to hold the resulting image, \fBTCL_ERROR\fR is
 returned instead and, if the \fIinterp\fR argument is non-NULL, an
 error message is placed in the interpreter's result.
 .VE 8.5
@@ -225,8 +225,8 @@ calls to \fBTk_PhotoPutBlock\fR, \fBTk_PhotoPutZoomedBlock\fR or
 \fBTk_PhotoExpand\fR.
 .PP
 .VS 8.5
-\fBTk_PhotoSetSize\fR normally returns TCL_OK, though if it cannot
-allocate sufficient memory to hold the resulting image, TCL_ERROR is
+\fBTk_PhotoSetSize\fR normally returns \fBTCL_OK\fR, though if it cannot
+allocate sufficient memory to hold the resulting image, \fBTCL_ERROR\fR is
 returned instead and, if the \fIinterp\fR argument is non-NULL, an
 error message is placed in the interpreter's result.
 .VE 8.5
diff --git a/doc/GetBitmap.3 b/doc/GetBitmap.3
index 9aebcba..f092b7a 100644
--- a/doc/GetBitmap.3
+++ b/doc/GetBitmap.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: GetBitmap.3,v 1.6 2004/08/22 15:43:20 dkf Exp $
+'\" RCS: @(#) $Id: GetBitmap.3,v 1.7 2004/09/19 16:05:36 dkf Exp $
 '\" 
 .so man.macros
 .TH Tk_AllocBitmapFromObj 3 8.1 Tk "Tk Library Procedures"
@@ -221,9 +221,9 @@ argument gives a name for the bitmap;  it must not previously
 have been used in a call to \fBTk_DefineBitmap\fR.
 The arguments \fIsource\fR, \fIwidth\fR, and \fIheight\fR
 describe the bitmap.
-\fBTk_DefineBitmap\fR normally returns TCL_OK;  if an error occurs
+\fBTk_DefineBitmap\fR normally returns \fBTCL_OK\fR; if an error occurs
 (e.g. a bitmap named \fInameId\fR has already been defined) then
-TCL_ERROR is returned and an error message is left in
+\fBTCL_ERROR\fR is returned and an error message is left in
 \fIinterp->result\fR.
 Note:  \fBTk_DefineBitmap\fR expects the memory pointed to by
 \fIsource\fR to be static:  \fBTk_DefineBitmap\fR doesn't make
@@ -244,7 +244,7 @@ new bitmap named \fBfoo\fR:
 Pixmap bitmap;
 #include "stip.bitmap"
 Tk_DefineBitmap(interp, "foo", stip_bits,
-	stip_width, stip_height);
+    stip_width, stip_height);
 \&...
 bitmap = Tk_GetBitmap(interp, tkwin, "foo");
 .CE
diff --git a/doc/GetCursor.3 b/doc/GetCursor.3
index 6dcfc68..cc00ed4 100644
--- a/doc/GetCursor.3
+++ b/doc/GetCursor.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: GetCursor.3,v 1.6 2004/08/22 15:43:20 dkf Exp $
+'\" RCS: @(#) $Id: GetCursor.3,v 1.7 2004/09/19 16:05:36 dkf Exp $
 '\" 
 .so man.macros
 .TH Tk_AllocCursorFromObj 3 8.1 Tk "Tk Library Procedures"
@@ -180,8 +180,8 @@ Tk_Cursor cursor;
 #include "source.cursor"
 #include "mask.cursor"
 cursor = Tk_GetCursorFromData(interp, tkwin, source_bits,
-	mask_bits, source_width, source_height, source_x_hot,
-	source_y_hot, Tk_GetUid("red"), Tk_GetUid("blue"));
+    mask_bits, source_width, source_height, source_x_hot,
+    source_y_hot, Tk_GetUid("red"), Tk_GetUid("blue"));
 .CE
 .PP
 Under normal conditions \fBTk_GetCursorFromData\fR
diff --git a/doc/GetDash.3 b/doc/GetDash.3
index dc91012..eb6483a 100644
--- a/doc/GetDash.3
+++ b/doc/GetDash.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: GetDash.3,v 1.3 2004/08/22 15:43:20 dkf Exp $
+'\" RCS: @(#) $Id: GetDash.3,v 1.4 2004/09/19 16:05:36 dkf Exp $
 '\" 
 .so man.macros
 .TH Tk_GetDash 3 8.3 Tk "Tk Library Procedures"
@@ -34,8 +34,8 @@ value converted from \fIstring\fR.
 These procedure parses the string and fills in the result in the
 Tk_Dash structure. The string can be a list of integers or a
 character string containing only \fB[.,-_]\fR or spaces. If all
-goes well, TCL_OK is returned. If \fIstring\fR doesn't have the
-proper syntax then TCL_ERROR is returned, an error message is left
+goes well, \fBTCL_OK\fR is returned. If \fIstring\fR doesn't have the
+proper syntax then \fBTCL_ERROR\fR is returned, an error message is left
 in the interpreter's result, and nothing is stored at *\fIdashPtr\fR.
 .PP
 The first possible syntax is a list of integers. Each element
diff --git a/doc/GetImage.3 b/doc/GetImage.3
index 6b78dc4..640db54 100644
--- a/doc/GetImage.3
+++ b/doc/GetImage.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: GetImage.3,v 1.5 2002/08/05 04:30:38 dgp Exp $
+'\" RCS: @(#) $Id: GetImage.3,v 1.6 2004/09/19 16:05:36 dkf Exp $
 '\" 
 .so man.macros
 .TH Tk_GetImage 3 4.0 Tk "Tk Library Procedures"
@@ -109,13 +109,13 @@ The \fIchangeProc\fR and \fIclientData\fR arguments to
 in the image;  it must match the following prototype:
 .CS
 typedef void Tk_ImageChangedProc(
-	ClientData \fIclientData\fR,
-	int \fIx\fR,
-	int \fIy\fR,
-	int \fIwidth\fR,
-	int \fIheight\fR,
-	int \fIimageWidth\fR,
-	int \fIimageHeight\fR);
+    ClientData \fIclientData\fR,
+    int \fIx\fR,
+    int \fIy\fR,
+    int \fIwidth\fR,
+    int \fIheight\fR,
+    int \fIimageWidth\fR,
+    int \fIimageHeight\fR);
 .CE
 The \fIclientData\fR argument to \fIchangeProc\fR is the same as the
 \fIclientData\fR argument to \fBTk_GetImage\fR.
diff --git a/doc/GetRelief.3 b/doc/GetRelief.3
index f75bdaa..0b7b2cb 100644
--- a/doc/GetRelief.3
+++ b/doc/GetRelief.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: GetRelief.3,v 1.4 2002/08/05 04:30:38 dgp Exp $
+'\" RCS: @(#) $Id: GetRelief.3,v 1.5 2004/09/19 16:05:36 dkf Exp $
 '\" 
 .so man.macros
 .TH Tk_GetReliefFromObj 3 8.1 Tk "Tk Library Procedures"
@@ -45,8 +45,9 @@ Pointer to location in which to store relief value corresponding to
 .AP "CONST char" *name
 Name of the relief.
 .AP int relief in
-Relief value (one of TK_RELIEF_FLAT, TK_RELIEF_RAISED, TK_RELIEF_SUNKEN,
-TK_RELIEF_GROOVE, TK_RELIEF_SOLID, or TK_RELIEF_RIDGE).
+Relief value (one of \fBTK_RELIEF_FLAT\fR, \fBTK_RELIEF_RAISED\fR,
+\fBTK_RELIEF_SUNKEN\fR, \fBTK_RELIEF_GROOVE\fR, \fBTK_RELIEF_SOLID\fR,
+or \fBTK_RELIEF_RIDGE\fR).
 .BE
 
 .SH DESCRIPTION
@@ -54,12 +55,12 @@ TK_RELIEF_GROOVE, TK_RELIEF_SOLID, or TK_RELIEF_RIDGE).
 .VS 8.1
 \fBTk_GetReliefFromObj\fR places in \fI*reliefPtr\fR the relief value
 corresponding to the value of \fIobjPtr\fR.  This value will be one of
-TK_RELIEF_FLAT, TK_RELIEF_RAISED, TK_RELIEF_SUNKEN,
-TK_RELIEF_GROOVE, TK_RELIEF_SOLID, or TK_RELIEF_RIDGE.
-Under normal circumstances the return value is TCL_OK and
+\fBTK_RELIEF_FLAT\fR, \fBTK_RELIEF_RAISED\fR, \fBTK_RELIEF_SUNKEN\fR,
+\fBTK_RELIEF_GROOVE\fR, \fBTK_RELIEF_SOLID\fR, or \fBTK_RELIEF_RIDGE\fR.
+Under normal circumstances the return value is \fBTCL_OK\fR and
 \fIinterp\fR is unused.
 If \fIobjPtr\fR doesn't contain one of the valid relief names
-or an abbreviation of one of them, then TCL_ERROR is returned,
+or an abbreviation of one of them, then \fBTCL_ERROR\fR is returned,
 \fI*reliefPtr\fR is unmodified, and an error message
 is stored in \fIinterp\fR's result if \fIinterp\fR isn't NULL.
 \fBTk_GetReliefFromObj\fR caches information about the return
diff --git a/doc/GetSelect.3 b/doc/GetSelect.3
index d9aa308..c673866 100644
--- a/doc/GetSelect.3
+++ b/doc/GetSelect.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: GetSelect.3,v 1.2 1998/09/14 18:22:51 stanton Exp $
+'\" RCS: @(#) $Id: GetSelect.3,v 1.3 2004/09/19 16:05:36 dkf Exp $
 '\" 
 .so man.macros
 .TH Tk_GetSelection 3 4.0 Tk "Tk Library Procedures"
@@ -46,9 +46,9 @@ should have arguments and result that match the type
 \fBTk_GetSelProc\fR:
 .CS
 typedef int Tk_GetSelProc(
-	ClientData \fIclientData\fR,
-	Tcl_Interp *\fIinterp\fR,
-	char *\fIportion\fR);
+    ClientData \fIclientData\fR,
+    Tcl_Interp *\fIinterp\fR,
+    char *\fIportion\fR);
 .CE
 The \fIclientData\fR and \fIinterp\fR parameters to \fIproc\fR 
 will be copies of the corresponding arguments to
@@ -68,12 +68,12 @@ values separated by white space.
 \fBTk_GetSelection\fR returns to its caller when the selection has
 been completely retrieved and processed by \fIproc\fR, or when a
 fatal error has occurred (e.g. the selection owner didn't respond
-promptly).  \fBTk_GetSelection\fR normally returns TCL_OK;  if
-an error occurs, it returns TCL_ERROR and leaves an error message
+promptly).  \fBTk_GetSelection\fR normally returns \fBTCL_OK\fR;  if
+an error occurs, it returns \fBTCL_ERROR\fR and leaves an error message
 in \fIinterp->result\fR.  \fIProc\fR should also return either
-TCL_OK or TCL_ERROR. If \fIproc\fR encounters an error in dealing with the
+\fBTCL_OK\fR or \fBTCL_ERROR\fR. If \fIproc\fR encounters an error in dealing with the
 selection, it should leave an error message in \fIinterp->result\fR
-and return TCL_ERROR;  this will abort the selection retrieval.
+and return \fBTCL_ERROR\fR;  this will abort the selection retrieval.
 
 .SH KEYWORDS
 format, get, selection retrieval
diff --git a/doc/Grab.3 b/doc/Grab.3
index 02ae55f..dafb12b 100644
--- a/doc/Grab.3
+++ b/doc/Grab.3
@@ -2,7 +2,7 @@
 '\" Copyright (c) 1998-2000 by Scriptics Corporation.
 '\" All rights reserved.
 '\" 
-'\" RCS: @(#) $Id: Grab.3,v 1.1 2000/04/25 02:12:15 ericm Exp $
+'\" RCS: @(#) $Id: Grab.3,v 1.2 2004/09/19 16:05:36 dkf Exp $
 '\" 
 .so man.macros
 .TH Tk_Grab 3 "" Tk "Tk Library Procedures"
@@ -47,8 +47,8 @@ keyboard events intended for a windows within the same application
 specifies the window on whose behalf the pointer is to be grabbed.
 \fIGrabGlobal\fR indicates whether the grab should be global or
 application local; if it is non-zero, it means the grab should be
-global.  Normally, \fBTk_Grab\fR returns TCL_OK; if an error occurs
-and the grab cannot be set, TCL_ERROR is returned and an error message
+global.  Normally, \fBTk_Grab\fR returns \fBTCL_OK\fR; if an error occurs
+and the grab cannot be set, \fBTCL_ERROR\fR is returned and an error message
 is left if \fIinterp\fR's result.  Once this call completes
 successfully, no window outside the tree rooted at \fItkwin\fR will
 receive pointer- or keyboard-related events until the next call to
diff --git a/doc/ManageGeom.3 b/doc/ManageGeom.3
index b5b348d..94e8041 100644
--- a/doc/ManageGeom.3
+++ b/doc/ManageGeom.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: ManageGeom.3,v 1.2 1998/09/14 18:22:52 stanton Exp $
+'\" RCS: @(#) $Id: ManageGeom.3,v 1.3 2004/09/19 16:05:36 dkf Exp $
 '\" 
 .so man.macros
 .TH Tk_ManageGeometry 3 4.0 Tk "Tk Library Procedures"
@@ -45,9 +45,9 @@ The structure pointed to by \fImgrPtr\fR contains information about
 the geometry manager:
 .CS
 typedef struct {
-	char *\fIname\fR;
-	Tk_GeomRequestProc *\fIrequestProc\fR;
-	Tk_GeomLostSlaveProc *\fIlostSlaveProc\fR;
+    char *\fIname\fR;
+    Tk_GeomRequestProc *\fIrequestProc\fR;
+    Tk_GeomLostSlaveProc *\fIlostSlaveProc\fR;
 } Tk_GeomMgr;
 .CE
 The \fIname\fR field is the textual name for the geometry manager,
@@ -61,8 +61,8 @@ slave to change its desired geometry.
 type \fBTk_GeomRequestProc\fR:
 .CS
 typedef void Tk_GeomRequestProc(
-	ClientData \fIclientData\fR,
-	Tk_Window \fItkwin\fR);
+    ClientData \fIclientData\fR,
+    Tk_Window \fItkwin\fR);
 .CE
 The parameters to \fIrequestProc\fR will be identical to the
 corresponding parameters passed to \fBTk_ManageGeometry\fR.
@@ -84,8 +84,8 @@ is the same as the window's current geometry manager.
 arguments and results that match the following prototype:
 .CS
 typedef void Tk_GeomLostSlaveProc(
-	ClientData \fIclientData\fR,
-	Tk_Window \fItkwin\fR);
+    ClientData \fIclientData\fR,
+    Tk_Window \fItkwin\fR);
 .CE
 The parameters to \fIlostSlaveProc\fR will be identical to the
 corresponding parameters passed to \fBTk_ManageGeometry\fR.
diff --git a/doc/MeasureChar.3 b/doc/MeasureChar.3
index bf4d5a0..324e623 100644
--- a/doc/MeasureChar.3
+++ b/doc/MeasureChar.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: MeasureChar.3,v 1.5 2004/08/22 15:43:20 dkf Exp $
+'\" RCS: @(#) $Id: MeasureChar.3,v 1.6 2004/09/19 16:05:36 dkf Exp $
 '\" 
 .so man.macros
 .TH Tk_MeasureChars 3 8.1 Tk "Tk Library Procedures"
@@ -48,13 +48,13 @@ line length in pixels.  Characters from \fIstring\fR are processed only
 until this many pixels have been covered.  If \fImaxPixels\fR is < 0, then
 the line length is unbounded and the \fIflags\fR argument is ignored.
 .AP int flags in
-Various flag bits OR-ed together: TK_PARTIAL_OK means include a character
+Various flag bits OR-ed together: \fBTK_PARTIAL_OK\fR means include a character
 as long as any part of it fits in the length given by \fImaxPixels\fR;
 otherwise, a character must fit completely to be considered.
-TK_WHOLE_WORDS means stop on a word boundary, if possible.  If
-TK_AT_LEAST_ONE is set, it means return at least one character even if no
+\fBTK_WHOLE_WORDS\fR means stop on a word boundary, if possible.  If
+\fBTK_AT_LEAST_ONE\fR is set, it means return at least one character even if no
 characters could fit in the length given by \fImaxPixels\fR.  If
-TK_AT_LEAST_ONE is set and TK_WHOLE_WORDS is also set, it means that if
+\fBTK_AT_LEAST_ONE\fR is set and \fBTK_WHOLE_WORDS\fR is also set, it means that if
 not even one word fits on the line, return the first few letters of the
 word that did fit; if not even one letter of the word fit, then the first
 letter will still be returned.
diff --git a/doc/ParseArgv.3 b/doc/ParseArgv.3
index 90ecff7..7de1ab3 100644
--- a/doc/ParseArgv.3
+++ b/doc/ParseArgv.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: ParseArgv.3,v 1.4 2004/08/20 14:15:29 dkf Exp $
+'\" RCS: @(#) $Id: ParseArgv.3,v 1.5 2004/09/19 16:05:36 dkf Exp $
 '\" 
 .so man.macros
 .TH Tk_ParseArgv 3 "" Tk "Tk Library Procedures"
@@ -33,12 +33,13 @@ Command line arguments passed to main program.  Modified to
 hold unprocessed arguments that remain after the call.
 .AP Tk_ArgvInfo *argTable in
 Array of argument descriptors, terminated by element with
-type TK_ARGV_END.
+type \fBTK_ARGV_END\fR.
 .AP int flags in
 If non-zero, then it specifies one or more flags that control the
 parsing of arguments.  Different flags may be OR'ed together.
-The flags currently defined are TK_ARGV_DONT_SKIP_FIRST_ARG,
-TK_ARGV_NO_ABBREV, TK_ARGV_NO_LEFTOVERS, and TK_ARGV_NO_DEFAULTS.
+The flags currently defined are \fBTK_ARGV_DONT_SKIP_FIRST_ARG\fR,
+\fBTK_ARGV_NO_ABBREV\fR, \fBTK_ARGV_NO_LEFTOVERS\fR, and
+\fBTK_ARGV_NO_DEFAULTS\fR.
 .BE
 .SH DESCRIPTION
 .PP
@@ -55,12 +56,12 @@ arguments that are left in \fIargv\fR, and \fIargv[*argcPtr]\fR
 will hold the value NULL.  Normally, \fBTk_ParseArgv\fR
 assumes that \fIargv[0]\fR is a command name, so it is treated like
 an argument that doesn't match \fIargTable\fR and returned to the
-caller;  however, if the TK_ARGV_DONT_SKIP_FIRST_ARG bit is set in
+caller;  however, if the \fBTK_ARGV_DONT_SKIP_FIRST_ARG\fR bit is set in
 \fIflags\fR then \fIargv[0]\fR will be processed just like the other
 elements of \fIargv\fR.
 .PP
-\fBTk_ParseArgv\fR normally returns the value TCL_OK.  If an error
-occurs while parsing the arguments, then TCL_ERROR is returned and
+\fBTk_ParseArgv\fR normally returns the value \fBTCL_OK\fR.  If an error
+occurs while parsing the arguments, then \fBTCL_ERROR\fR is returned and
 \fBTk_ParseArgv\fR will leave an error message in \fIinterp->result\fR
 in the standard Tcl fashion.  In
 the event of an error return, \fI*argvPtr\fR will not have been
@@ -71,11 +72,11 @@ The \fIargTable\fR array specifies the kinds of arguments that are
 expected;  each of its entries has the following structure:
 .CS
 typedef struct {
-	char *\fIkey\fR;
-	int \fItype\fR;
-	char *\fIsrc\fR;
-	char *\fIdst\fR;
-	char *\fIhelp\fR;
+    char *\fIkey\fR;
+    int \fItype\fR;
+    char *\fIsrc\fR;
+    char *\fIdst\fR;
+    char *\fIhelp\fR;
 } Tk_ArgvInfo;
 .CE
 The \fIkey\fR field is a string such as ``\-display'' or ``\-bg''
@@ -144,7 +145,7 @@ argument, and discards the matching and following arguments from
 \fIargv\fR.  \fISrc\fR is ignored.
 .TP
 \fBTK_ARGV_UID\fR
-This form is similar to TK_ARGV_STRING, except that the argument
+This form is similar to \fBTK_ARGV_STRING\fR, except that the argument
 is turned into a Tk_Uid by calling \fBTk_GetUid\fR.
 \fIDst\fR is treated as a pointer to a
 Tk_Uid; \fBTk_ParseArgv\fR stores at \fI*dst\fR the Tk_Uid
@@ -161,7 +162,7 @@ argument is discarded.  If \fItkwin\fR is NULL, then argument
 specifiers of this type are ignored (as if they did not exist).
 .TP
 \fBTK_ARGV_OPTION_VALUE\fR
-This form is similar to TK_ARGV_CONST_OPTION, except that the
+This form is similar to \fBTK_ARGV_CONST_OPTION\fR, except that the
 value of the option is taken from the following argument instead
 of from \fIsrc\fR.  \fIDst\fR is used as the name of the option.
 \fISrc\fR is ignored.  The matching and following arguments
@@ -180,12 +181,12 @@ specifiers of this type are ignored (as if they did not exist).
 When this kind of option is encountered, \fBTk_ParseArgv\fR uses the
 \fIhelp\fR fields of \fIargTable\fR to format a message describing
 all the valid arguments.  The message is placed in \fIinterp->result\fR
-and \fBTk_ParseArgv\fR returns TCL_ERROR.  When this happens, the
+and \fBTk_ParseArgv\fR returns \fBTCL_ERROR\fR.  When this happens, the
 caller normally prints the help message and aborts.  If the \fIkey\fR
-field of a TK_ARGV_HELP specifier is NULL, then the specifier will
+field of a \fBTK_ARGV_HELP\fR specifier is NULL, then the specifier will
 never match any arguments;  in this case the specifier simply provides
 extra documentation, which will be included when some other
-TK_ARGV_HELP entry causes help information to be returned.
+\fBTK_ARGV_HELP\fR entry causes help information to be returned.
 .TP
 \fBTK_ARGV_REST\fR
 This option is used by programs or commands that allow the last
@@ -208,9 +209,9 @@ The procedure should have the following structure:
 .CS
 int
 \fIfunc\fR(\fIdst\fR, \fIkey\fR, \fInextArg\fR)
-	char *\fIdst\fR;
-	char *\fIkey\fR;
-	char *\fInextArg\fR;
+    char *\fIdst\fR;
+    char *\fIkey\fR;
+    char *\fInextArg\fR;
 {
 }
 .CE
@@ -234,11 +235,11 @@ form:
 .CS
 int
 \fIgenfunc\fR(dst, interp, key, argc, argv)
-	char *\fIdst\fR;
-	Tcl_Interp *\fIinterp\fR;
-	char *\fIkey\fR;
-	int \fIargc\fR;
-	char **\fIargv\fR;
+    char *\fIdst\fR;
+    Tcl_Interp *\fIinterp\fR;
+    char *\fIkey\fR;
+    int \fIargc\fR;
+    char **\fIargv\fR;
 {
 }
 .CE
@@ -254,7 +255,7 @@ should return a count of how many arguments are left in \fIargv\fR;
 \fBTk_ParseArgv\fR will process them.  If \fIgenfunc\fR encounters
 an error then it should leave an error message in \fIinterp->result\fR,
 in the usual Tcl fashion, and return -1;  when this happens
-\fBTk_ParseArgv\fR will abort its processing and return TCL_ERROR.
+\fBTk_ParseArgv\fR will abort its processing and return \fBTCL_ERROR\fR.
 .RE
 
 .SH "FLAGS"
@@ -276,7 +277,7 @@ caller.  If this bit is set in \fIflags\fR then \fBTk_ParseArgv\fR
 will return an error if it encounters any argument that doesn't
 match \fIargTable\fR.  The only exception to this rule is \fIargv[0]\fR,
 which will be returned to the caller with no errors as
-long as TK_ARGV_DONT_SKIP_FIRST_ARG isn't specified.
+long as \fBTK_ARGV_DONT_SKIP_FIRST_ARG\fR isn't specified.
 .TP
 \fBTK_ARGV_NO_DEFAULTS\fR
 Normally, \fBTk_ParseArgv\fR searches an internal table of
@@ -305,32 +306,32 @@ Boolean exec = FALSE;
  * Define option descriptions.
  */
 Tk_ArgvInfo argTable[] = {
-	{"-X", TK_ARGV_CONSTANT, (char *) 1, (char *) &debugFlag,
-		"Turn on debugging printfs"},
-	{"-N", TK_ARGV_INT, (char *) NULL, (char *) &numReps,
-		"Number of repetitions"},
-	{"-of", TK_ARGV_STRING, (char *) NULL, (char *) &fileName,
-		"Name of file for output"},
-	{"x", TK_ARGV_REST, (char *) NULL, (char *) &exec,
-		"File to exec, followed by any arguments (must be last argument)."},
-	{(char *) NULL, TK_ARGV_END, (char *) NULL, (char *) NULL,
-	    (char *) NULL}
+    {"-X", TK_ARGV_CONSTANT, (char *) 1, (char *) &debugFlag,
+        "Turn on debugging printfs"},
+    {"-N", TK_ARGV_INT, (char *) NULL, (char *) &numReps,
+        "Number of repetitions"},
+    {"-of", TK_ARGV_STRING, (char *) NULL, (char *) &fileName,
+        "Name of file for output"},
+    {"x", TK_ARGV_REST, (char *) NULL, (char *) &exec,
+        "File to exec, followed by any arguments (must be last argument)."},
+    {(char *) NULL, TK_ARGV_END, (char *) NULL, (char *) NULL,
+        (char *) NULL}
 };
 
 main(argc, argv)
-	int argc;
-	char *argv[];
+    int argc;
+    char *argv[];
 {
-	\&...
+    \&...
 
-	if (Tk_ParseArgv(interp, tkwin, &argc, argv, argTable, 0) != TCL_OK) {
-		fprintf(stderr, "%s\en", interp->result);
-		exit(1);
-	}
+    if (Tk_ParseArgv(interp, tkwin, &argc, argv, argTable, 0) != TCL_OK) {
+        fprintf(stderr, "%s\en", interp->result);
+        exit(1);
+    }
 
-	/*
-	 * Remainder of the program.
-	 */
+    /*
+     * Remainder of the program.
+     */
 }
 .CE
 .PP
@@ -339,9 +340,9 @@ Note that default values can be assigned to variables named in
 particular arguments are present in \fIargv\fR.
 Here are some example command lines and their effects.
 .CS
-prog -N 200 infile		# just sets the numReps variable to 200
-prog -of out200 infile 	# sets fileName to reference "out200"
-prog -XN 10 infile		# sets the debug flag, also sets numReps
+prog -N 200 infile        # just sets the numReps variable to 200
+prog -of out200 infile    # sets fileName to reference "out200"
+prog -XN 10 infile        # sets the debug flag, also sets numReps
 .CE
 In all of the above examples, \fIargc\fR will be set by \fBTk_ParseArgv\fR to 2,
 \fIargv\fR[0] will be ``prog'', \fIargv\fR[1] will be ``infile'',
diff --git a/doc/RestrictEv.3 b/doc/RestrictEv.3
index 5af42a5..abf231f 100644
--- a/doc/RestrictEv.3
+++ b/doc/RestrictEv.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: RestrictEv.3,v 1.2 1998/09/14 18:22:53 stanton Exp $
+'\" RCS: @(#) $Id: RestrictEv.3,v 1.3 2004/09/19 16:05:36 dkf Exp $
 '\" 
 .so man.macros
 .TH Tk_RestrictEvents 3 "" Tk "Tk Library Procedures"
@@ -43,8 +43,8 @@ is a procedure with arguments and result that match
 the type \fBTk_RestrictProc\fR:
 .CS
 typedef Tk_RestrictAction Tk_RestrictProc(
-	ClientData \fIclientData\fR,
-	XEvent *\fIeventPtr\fR);
+    ClientData \fIclientData\fR,
+    XEvent *\fIeventPtr\fR);
 .CE
 The \fIclientData\fR argument is a copy of the \fIclientData\fR passed
 to \fBTk_RestrictEvents\fR; it may be used to provide \fIproc\fR with
diff --git a/doc/SetClassProcs.3 b/doc/SetClassProcs.3
index 691c9d2..a9edef3 100644
--- a/doc/SetClassProcs.3
+++ b/doc/SetClassProcs.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: SetClassProcs.3,v 1.2 2004/08/22 15:43:20 dkf Exp $
+'\" RCS: @(#) $Id: SetClassProcs.3,v 1.3 2004/09/19 16:05:36 dkf Exp $
 '\" 
 .so man.macros
 .TH Tk_SetClassProcs 3 8.4 Tk "Tk Library Procedures"
@@ -36,10 +36,10 @@ are used as callbacks in different places.
 The structure pointed to by \fIprocs\fR contains the following:
 .CS
 typedef struct Tk_ClassProcs {
-	unsigned int \fIsize\fR;
-	Tk_ClassWorldChangedProc *\fIworldChangedProc\fR;
-	Tk_ClassCreateProc *\fIcreateProc\fR;
-	Tk_ClassModalProc *\fImodalProc\fR;
+    unsigned int \fIsize\fR;
+    Tk_ClassWorldChangedProc *\fIworldChangedProc\fR;
+    Tk_ClassCreateProc *\fIcreateProc\fR;
+    Tk_ClassModalProc *\fImodalProc\fR;
 } Tk_ClassProcs;
 .CE
 The \fIsize\fR field is used to simplify future expansion of the
@@ -53,7 +53,7 @@ accordingly.  \fIworldChangedProc\fR should have arguments and results
 that match the type \fBTk_ClassWorldChangedProc\fR:
 .CS
 typedef void Tk_ClassWorldChangedProc(
-	ClientData \fIinstanceData\fR);
+    ClientData \fIinstanceData\fR);
 .CE
 The \fIinstanceData\fR parameter passed to the \fIworldChangedProc\fR
 will be identical to the \fIinstanceData\fR parameter passed to
@@ -64,9 +64,9 @@ invoked by \fBTk_MakeWindowExist\fR.  \fIcreateProc\fR should have
 arguments and results that match the type \fBTk_ClassCreateProc\fR:
 .CS
 typedef Window Tk_ClassCreateProc(
-	Tk_Window \fItkwin\fR,
-	Window \fIparent\fR,
-	ClientData \fIinstanceData\fR);
+    Tk_Window \fItkwin\fR,
+    Window \fIparent\fR,
+    ClientData \fIinstanceData\fR);
 .CE
 The \fItkwin\fR and \fIinstanceData\fR parameters will be identical to
 the \fItkwin\fR and \fIinstanceData\fR parameters passed to
@@ -79,8 +79,8 @@ triggered in order to handle a modal loop.  \fImodalProc\fR should
 have arguments and results that match the type \fBTk_ClassModalProc\fR:
 .CS
 typedef void Tk_ClassModalProc(
-	Tk_Window \fItkwin\fR,
-	XEvent *\fIeventPtr\fR);
+    Tk_Window \fItkwin\fR,
+    XEvent *\fIeventPtr\fR);
 .CE
 The \fItkwin\fR parameter to \fImodalProc\fR will be identical to the
 \fItkwin\fR parameter passed to \fBTk_SetClassProcs\fR.  The
diff --git a/doc/SetOptions.3 b/doc/SetOptions.3
index b079332..7e4dc13 100644
--- a/doc/SetOptions.3
+++ b/doc/SetOptions.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: SetOptions.3,v 1.10 2004/08/22 15:43:20 dkf Exp $
+'\" RCS: @(#) $Id: SetOptions.3,v 1.11 2004/09/19 16:05:36 dkf Exp $
 '\" 
 .so man.macros
 .TH Tk_SetOptions 3 8.1 Tk "Tk Library Procedures"
@@ -59,7 +59,7 @@ Points to structure in which values of configuration options are stored;
 fields of this record are modified by procedures such as \fBTk_SetOptions\fR
 and read by procedures such as \fBTk_GetOptionValue\fR.
 .AP Tk_Window tkwin in
-For options such as TK_OPTION_COLOR, this argument indicates
+For options such as \fBTK_OPTION_COLOR\fR, this argument indicates
 the window in which the option will be used.  If \fIoptionTable\fR uses
 no window-dependent options, then a NULL value may be supplied for
 this argument.
@@ -138,8 +138,8 @@ uses the information in the option table to
 choose an appropriate default for each option, then it stores the default
 value directly into the widget record, overwriting any information that
 was already present in the widget record.  \fBTk_InitOptions\fR normally
-returns TCL_OK.  If an error occurred while setting the default values
-(e.g., because a default value was erroneous) then TCL_ERROR is returned
+returns \fBTCL_OK\fR.  If an error occurred while setting the default values
+(e.g., because a default value was erroneous) then \fBTCL_ERROR\fR is returned
 and an error message is left in \fIinterp\fR's result if \fIinterp\fR
 isn't NULL.
 .PP
@@ -153,9 +153,9 @@ an option and the second object gives the new value for that option.
 \fBTk_SetOptions\fR looks up each name in \fIoptionTable\fR, checks that
 the new value of the option conforms to the type in \fIoptionTable\fR,
 and stores the value of the option into the widget record given by
-\fIrecordPtr\fR.  \fBTk_SetOptions\fR normally returns TCL_OK.  If
+\fIrecordPtr\fR.  \fBTk_SetOptions\fR normally returns \fBTCL_OK\fR.  If
 an error occurred (such as an unknown option name or an illegal option
-value) then TCL_ERROR is returned and an error message is left in
+value) then \fBTCL_ERROR\fR is returned and an error message is left in
 \fIinterp\fR's result if \fIinterp\fR isn't NULL.
 .PP
 \fBTk_SetOptions\fR has two additional features.  First, if the
@@ -252,20 +252,20 @@ supported by a particular class of widgets.  Each structure specifies
 one configuration option and has the following fields:
 .CS
 typedef struct {
-	Tk_OptionType \fItype\fR;
-	char *\fIoptionName\fR;
-	char *\fIdbName\fR;
-	char *\fIdbClass\fR;
-	char *\fIdefValue\fR;
-	int \fIobjOffset\fR;
-	int \fIinternalOffset\fR;
-	int \fIflags\fR;
-	ClientData \fIclientData\fR;
-	int \fItypeMask\fR;
+    Tk_OptionType \fItype\fR;
+    char *\fIoptionName\fR;
+    char *\fIdbName\fR;
+    char *\fIdbClass\fR;
+    char *\fIdefValue\fR;
+    int \fIobjOffset\fR;
+    int \fIinternalOffset\fR;
+    int \fIflags\fR;
+    ClientData \fIclientData\fR;
+    int \fItypeMask\fR;
 } Tk_OptionSpec;
 .CE
 The \fItype\fR field indicates what kind of configuration option this is
-(e.g. TK_OPTION_COLOR for a color value, or TK_OPTION_INT for
+(e.g. \fBTK_OPTION_COLOR\fB for a color value, or \fBTK_OPTION_INT\fR for
 an integer value).  \fIType\fR determines how the
 value of the option is parsed (more on this below).
 The \fIoptionName\fR field is a string such as \fB\-font\fR or \fB\-bg\fR;
@@ -285,7 +285,7 @@ The \fIflags\fR field contains additional information
 to control the processing of this configuration option (see below
 for details).
 \fIClientData\fR provides additional type-specific data needed
-by certain types.  For instance, for TK_OPTION_COLOR types,
+by certain types.  For instance, for \fBTK_OPTION_COLOR\fR types,
 \fIclientData\fR is a string giving the default value to use on
 monochrome displays.  See the descriptions of the different types
 below for details.
@@ -302,22 +302,22 @@ If the \fIinternalOffset\fR field of the Tk_OptionSpec is
 greater than or equal to zero, then the value of the option is stored
 in a type-specific internal form at the location in the widget record
 given by \fIinternalOffset\fR.  For example, if the option's type is
-TK_OPTION_INT then the internal form is an integer.  If the
+\fBTK_OPTION_INT\fR then the internal form is an integer.  If the
 \fIobjOffset\fR or \fIinternalOffset\fR field is negative then the
 value is not stored in that form.  At least one of the offsets must be
 greater than or equal to zero.
 .PP
 The \fIflags\fR field consists of one or more bits ORed together.  At
-present only a single flag is supported: TK_OPTION_NULL_OK.  If
+present only a single flag is supported: \fBTK_OPTION_NULL_OK\fR.  If
 this bit is set for an option then an empty string will be accepted as
 the value for the option and the resulting internal form will be a
 NULL pointer, a zero value, or \fBNone\fR, depending on the type of
 the option.  If the flag is not set then empty strings will result
 in errors.
-TK_OPTION_NULL_OK is typically used to allow a
+\fBTK_OPTION_NULL_OK\fR is typically used to allow a
 feature to be turned off entirely, e.g. set a cursor value to
 \fBNone\fR so that a window simply inherits its parent's cursor.
-Not all option types support the TK_OPTION_NULL_OK
+Not all option types support the \fBTK_OPTION_NULL_OK\fR
 flag; for those that do, there is an explicit indication of that fact
 in the descriptions below.
 .PP
@@ -339,7 +339,7 @@ returned by \fBTk_GetAnchorFromObj\fR.
 The value must be a standard Tk bitmap name. The internal form is a
 Pixmap token like the ones returned by \fBTk_AllocBitmapFromObj\fR.
 This option type requires \fItkwin\fR to be supplied to procedures
-such as \fBTk_SetOptions\fR, and it supports the TK_OPTION_NULL_OK flag.
+such as \fBTk_SetOptions\fR, and it supports the \fBTK_OPTION_NULL_OK\fR flag.
 .TP
 \fBTK_OPTION_BOOLEAN\fR
 The value must be a standard boolean value such as \fBtrue\fR or
@@ -350,14 +350,14 @@ The value must be a standard color name such as \fBred\fR or \fB#ff8080\fR.
 The internal form is a Tk_3DBorder token like the ones returned
 by \fBTk_Alloc3DBorderFromObj\fR.
 This option type requires \fItkwin\fR to be supplied to procedures
-such as \fBTk_SetOptions\fR, and it supports the TK_OPTION_NULL_OK flag.
+such as \fBTk_SetOptions\fR, and it supports the \fBTK_OPTION_NULL_OK\fR flag.
 .TP
 \fBTK_OPTION_COLOR\fR
 The value must be a standard color name such as \fBred\fR or \fB#ff8080\fR.
 The internal form is an (XColor *) token like the ones returned by
 \fBTk_AllocColorFromObj\fR.
 This option type requires \fItkwin\fR to be supplied to procedures
-such as \fBTk_SetOptions\fR, and it supports the TK_OPTION_NULL_OK flag.
+such as \fBTk_SetOptions\fR, and it supports the \fBTK_OPTION_NULL_OK\fR flag.
 .TP
 \fBTK_OPTION_CURSOR\fR
 The value must be a standard cursor name such as \fBcross\fR or \fB@foo\fR.
@@ -366,25 +366,25 @@ The internal form is a Tk_Cursor token like the ones returned by
 This option type requires \fItkwin\fR to be supplied to procedures
 such as \fBTk_SetOptions\fR, and when the option is set the cursor
 for the window is changed by calling \fBXDefineCursor\fR.  This
-option type also supports the TK_OPTION_NULL_OK flag.
+option type also supports the \fBTK_OPTION_NULL_OK\fR flag.
 .TP
 \fBTK_OPTION_CUSTOM\fR
 This option allows applications to define new option types.  The
 clientData field of the entry points to a structure defining the new
-option type.  See the section CUSTOM OPTION TYPES below for details.
+option type.  See the section \fBCUSTOM OPTION TYPES\fR below for details.
 .TP
 \fBTK_OPTION_DOUBLE\fR
 The string value must be a floating-point number in
 the format accepted by \fBstrtol\fR.  The internal form is a C
-\fBdouble\fR value.  This option type supports the TK_OPTION_NULL_OK
+\fBdouble\fR value.  This option type supports the \fBTK_OPTION_NULL_OK\fR
 flag; if a NULL value is set, the internal representation is set to zero.
 .TP
 \fBTK_OPTION_END\fR
 Marks the end of the template.  There must be a Tk_OptionSpec structure
-with \fItype\fR TK_OPTION_END at the end of each template.  If the
+with \fItype\fR \fBTK_OPTION_END\fR at the end of each template.  If the
 \fIclientData\fR field of this structure isn't NULL, then it points to
 an additional array of Tk_OptionSpec's, which is itself terminated by
-another TK_OPTION_END entry.  Templates may be chained arbitrarily
+another \fBTK_OPTION_END\fR entry.  Templates may be chained arbitrarily
 deeply.  This feature allows common options to be shared by several
 widget classes.
 .TP
@@ -393,7 +393,7 @@ The value must be a standard font name such as \fBTimes 16\fR.
 The internal form is a Tk_Font handle like the ones returned by
 \fBTk_AllocFontFromObj\fR.
 This option type requires \fItkwin\fR to be supplied to procedures
-such as \fBTk_SetOptions\fR, and it supports the TK_OPTION_NULL_OK flag.
+such as \fBTk_SetOptions\fR, and it supports the \fBTK_OPTION_NULL_OK\fR flag.
 .TP
 \fBTK_OPTION_INT\fR
 The string value must be an integer in the format accepted by
@@ -413,20 +413,20 @@ distance in pixels, like the values returned by
 \fBTk_GetPixelsFromObj\fR.  Note: if the \fIobjOffset\fR field isn't
 used then information about the original value of this option will be lost.
 See \fBOBJOFFSET VS. INTERNALOFFSET\fR below for details.  This option
-type supports the TK_OPTION_NULL_OK flag; if a NULL value is set, the
+type supports the \fBTK_OPTION_NULL_OK\fR flag; if a NULL value is set, the
 internal representation is set to zero.
 .TP
 \fBTK_OPTION_RELIEF\fR
 The value must be standard relief such as \fBraised\fR.
 The internal form is an integer relief value such as
-TK_RELIEF_RAISED.  This option type supports the TK_OPTION_NULL_OK
+\fBTK_RELIEF_RAISED\fR.  This option type supports the \fBTK_OPTION_NULL_OK\fR
 flag; if the empty string is specified as the value for the option,
-the integer relief value is set to TK_RELIEF_NULL.
+the integer relief value is set to \fBTK_RELIEF_NULL\fR.
 .TP
 \fBTK_OPTION_STRING\fR
 The value may be any string.  The internal form is a (char *) pointer
 that points to a dynamically allocated copy of the value.
-This option type supports the TK_OPTION_NULL_OK flag.
+This option type supports the \fBTK_OPTION_NULL_OK\fR flag.
 .TP
 \fBTK_OPTION_STRING_TABLE\fR
 For this type, \fIclientData\fR is a pointer to an array of strings
@@ -449,7 +449,7 @@ The value must be a window path name.  The internal form is a
 \fBTk_Window\fR token for the window.
 This option type requires \fItkwin\fR to be supplied to procedures
 such as \fBTk_SetOptions\fR (in order to identify the application),
-and it supports the TK_OPTION_NULL_OK flag.
+and it supports the \fBTK_OPTION_NULL_OK\fR flag.
 
 .SH "STORAGE MANAGEMENT ISSUES"
 .PP
@@ -459,8 +459,8 @@ procedures described here will handle all of the storage allocation and
 resource management issues associated with the field.  When the value
 of an option is changed, \fBTk_SetOptions\fR (or \fBTk_FreeSavedOptions\fR)
 will automatically free any resources associated with the old value, such as
-Tk_Fonts for TK_OPTION_FONT options or dynamically allocated memory for
-TK_OPTION_STRING options.  For an option stored as an object using the
+Tk_Fonts for \fBTK_OPTION_FONT\fR options or dynamically allocated memory for
+\fBTK_OPTION_STRING\fR options.  For an option stored as an object using the
 \fIobjOffset\fR field of a Tk_OptionSpec, the widget record shares the
 object pointed to by the \fIobjv\fR value from the call to
 \fBTk_SetOptions\fR.  The reference count for this object is incremented
@@ -483,13 +483,13 @@ makes the internal form of the value immediately available to the
 widget code so the value doesn't have to be extracted from an object
 each time it is used.  However, there are two cases where the
 \fIobjOffset\fR field is useful.  The first case is for
-TK_OPTION_PIXELS options.  In this case, the internal form is
+\fBTK_OPTION_PIXELS\fR options.  In this case, the internal form is
 an integer pixel value that is valid only for a particular screen.
 If the value of the option is retrieved, it will be returned as a simple
 number.  For example, after the command \fB.b configure \-borderwidth 2m\fR,
 the command \fB.b configure \-borderwidth\fR might return 7, which is the
 integer pixel value corresponding to \fB2m\fR.  Unfortunately, this loses
-the original screen-independent value.  Thus for TK_OPTION_PIXELS options
+the original screen-independent value. Thus for \fBTK_OPTION_PIXELS\fR options
 it is better to use the \fIobjOffset\fR field.  In this case the original
 value of the option is retained in the object and can be returned when
 the option is retrieved.  In most cases it is convenient to use the
@@ -497,11 +497,11 @@ the option is retrieved.  In most cases it is convenient to use the
 immediately available for use in the widget code (alternatively,
 \fBTk_GetPixelsFromObj\fR can be used to extract the integer value from
 the object whenever it is needed).  Note: the problem of losing information
-on retrievals exists only for TK_OPTION_PIXELS options.
+on retrievals exists only for \fBTK_OPTION_PIXELS\fR options.
 .PP
 The second reason to use the \fIobjOffset\fR field is in order to
 implement new types of options not supported by these procedures.
-To implement a new type of option, you can use TK_OPTION_STRING as
+To implement a new type of option, you can use \fBTK_OPTION_STRING\fR as
 the type in the Tk_OptionSpec structure and set the \fIobjOffset\fR field
 but not the \fIinternalOffset\fR field.  Then, after calling
 \fBTk_SetOptions\fR, convert the object to internal form yourself.
@@ -514,40 +514,40 @@ free, and restore saved copies of the type and creating a structure
 pointing to those procedures:
 .CS
 typedef struct Tk_ObjCustomOption {
-	char *name;
-	Tk_CustomOptionSetProc *\fIsetProc\fR;
-	Tk_CustomOptionGetProc *\fIgetProc\fR;
-	Tk_CustomOptionRestoreProc *\fIrestoreProc\fR;
-	Tk_CustomOptionFreeProc *\fIfreeProc\fR;
-	ClientData \fIclientData\fR;
+    char *name;
+    Tk_CustomOptionSetProc *\fIsetProc\fR;
+    Tk_CustomOptionGetProc *\fIgetProc\fR;
+    Tk_CustomOptionRestoreProc *\fIrestoreProc\fR;
+    Tk_CustomOptionFreeProc *\fIfreeProc\fR;
+    ClientData \fIclientData\fR;
 } Tk_ObjCustomOption;
 
 typedef int Tk_CustomOptionSetProc(
-	ClientData \fIclientData\fR,
-	Tcl_Interp *\fIinterp\fR, 
-	Tk_Window \fItkwin\fR, 
-	Tcl_Obj **\fIvaluePtr\fR,
-	char *\fIrecordPtr\fR,
-	int \fIinternalOffset\fR,
-	char *\fIsaveInternalPtr\fR, 
-	int \fIflags\fR);
+    ClientData \fIclientData\fR,
+    Tcl_Interp *\fIinterp\fR, 
+    Tk_Window \fItkwin\fR, 
+    Tcl_Obj **\fIvaluePtr\fR,
+    char *\fIrecordPtr\fR,
+    int \fIinternalOffset\fR,
+    char *\fIsaveInternalPtr\fR, 
+    int \fIflags\fR);
 
 typedef Tcl_Obj *Tk_CustomOptionGetProc(
-	ClientData \fIclientData\fR,
-	Tk_Window \fItkwin\fR, 
-	char *\fIrecordPtr\fR,
-	int \fIinternalOffset\fR);
+    ClientData \fIclientData\fR,
+    Tk_Window \fItkwin\fR, 
+    char *\fIrecordPtr\fR,
+    int \fIinternalOffset\fR);
 
 typedef void Tk_CustomOptionRestoreProc(
-	ClientData \fIclientData\fR,
-	Tk_Window \fItkwin\fR, 
-	char *\fIinternalPtr\fR, 
-	char *\fIsaveInternalPtr\fR);
+    ClientData \fIclientData\fR,
+    Tk_Window \fItkwin\fR, 
+    char *\fIinternalPtr\fR, 
+    char *\fIsaveInternalPtr\fR);
 
 typedef void Tk_CustomOptionFreeProc(
-	ClientData \fIclientData\fR,
-	Tk_Window \fItkwin\fR, 
-	char *\fIinternalPtr\fR);
+    ClientData \fIclientData\fR,
+    Tk_Window \fItkwin\fR, 
+    char *\fIinternalPtr\fR);
 .CE
 .PP
 The Tk_ObjCustomOption structure contains six fields: a name
@@ -583,7 +583,7 @@ value is stored as a (Tcl_Obj *) in the widget record), the Tcl_Obj
 pointer referenced by \fIvaluePtr\fR is the pointer that will be
 stored at the objOffset for the option.  \fISetProc\fR may modify the
 value if necessary; for example, \fIsetProc\fR may change the value to
-NULL to support the TK_OPTION_NULL_OK flag.
+NULL to support the \fBTK_OPTION_NULL_OK\fR flag.
 .TP
 \fIrecordPtr\fR
 A pointer to the start of the widget record to modify.
@@ -604,8 +604,8 @@ A copy of the \fIflags\fR field in the Tk_OptionSpec structure for the
 option
 .RE
 .PP
-\fISetProc\fR returns a standard Tcl result:  TCL_OK to indicate successful
-processing, or TCL_ERROR to indicate a failure of any kind.  An error
+\fISetProc\fR returns a standard Tcl result: \fBTCL_OK\fR to indicate successful
+processing, or \fBTCL_ERROR\fR to indicate a failure of any kind.  An error
 message may be left in the Tcl interpreter given by \fIinterp\fR in
 the case of an error.
 .PP
diff --git a/doc/TextLayout.3 b/doc/TextLayout.3
index 0762089..6ad51d0 100644
--- a/doc/TextLayout.3
+++ b/doc/TextLayout.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: TextLayout.3,v 1.5 1999/04/21 21:53:22 rjohnson Exp $
+'\" RCS: @(#) $Id: TextLayout.3,v 1.6 2004/09/19 16:05:36 dkf Exp $
 '\" 
 .so man.macros
 .TH Tk_ComputeTextLayout 3 8.1 Tk "Tk Library Procedures"
@@ -69,15 +69,17 @@ wrapping; lines will get as long as they need to be and only wrap if a
 newline/return character is encountered.
 .AP Tk_Justify justify in
 How to justify the lines in a multi-line text layout.  Possible values
-are TK_JUSTIFY_LEFT, TK_JUSTIFY_CENTER, or TK_JUSTIFY_RIGHT.  If the text
-layout only occupies a single line, then \fIjustify\fR is irrelevant.  
+are \fBTK_JUSTIFY_LEFT\fR, \fBTK_JUSTIFY_CENTER\fR, or
+\fBTK_JUSTIFY_RIGHT\fR. If the text layout only occupies a single
+line, then \fIjustify\fR is irrelevant.
 .AP int flags in
-Various flag bits OR-ed together.  TK_IGNORE_TABS means that tab characters
-should not be expanded to the next tab stop.  TK_IGNORE_NEWLINES means that
-newline/return characters should not cause a line break.  If either tabs or
-newlines/returns are ignored, then they will be treated as regular
-characters, being measured and displayed in a platform-dependent manner as
-described in \fBTk_MeasureChars\fR, and will not have any special behaviors.
+Various flag bits OR-ed together. \fBTK_IGNORE_TABS\fR means that tab
+characters should not be expanded to the next tab stop.
+\fBTK_IGNORE_NEWLINES\fR means that newline/return characters should
+not cause a line break.  If either tabs or newlines/returns are
+ignored, then they will be treated as regular characters, being
+measured and displayed in a platform-dependent manner as described in
+\fBTk_MeasureChars\fR, and will not have any special behaviors.
 .AP int *widthPtr out
 If non-NULL, filled with either the width, in pixels, of the widest
 line in the text layout, or the width, in pixels, of the bounding box for the 
diff --git a/doc/TkInitStubs.3 b/doc/TkInitStubs.3
index 7eb9d7b..124fd6b 100644
--- a/doc/TkInitStubs.3
+++ b/doc/TkInitStubs.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: TkInitStubs.3,v 1.3 2004/08/20 14:15:29 dkf Exp $
+'\" RCS: @(#) $Id: TkInitStubs.3,v 1.4 2004/09/19 16:05:36 dkf Exp $
 '\" 
 .so man.macros
 .TH Tk_InitStubs 3 8.4 Tk "Tk Library Procedures"
@@ -50,8 +50,8 @@ Tcl functions.
 Call \fBTk_InitStubs\fR if the extension before calling any other
 Tk functions.
 .IP 2) 5
-Define the USE_TCL_STUBS symbol.  Typically, you would include the
--DUSE_TCL_STUBS flag when compiling the extension.
+Define the \fBUSE_TCL_STUBS\fR symbol. Typically, you would include the
+\fB-DUSE_TCL_STUBS\fR flag when compiling the extension.
 .IP 3) 5
 Link the extension with the Tcl and Tk stubs libraries instead of
 the standard Tcl and Tk libraries.  On Unix platforms, the library
diff --git a/doc/canvas.n b/doc/canvas.n
index 7403907..bfd7b51 100644
--- a/doc/canvas.n
+++ b/doc/canvas.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: canvas.n,v 1.16 2004/08/19 14:41:52 dkf Exp $
+'\" RCS: @(#) $Id: canvas.n,v 1.17 2004/09/19 16:05:36 dkf Exp $
 '\"
 .so man.macros
 .TH canvas n 8.3 Tk "Tk Built-In Commands"
@@ -39,14 +39,14 @@ be constrained within the scroll region.
 .OP \-height height Height
 Specifies a desired window height that the canvas widget should request from
 its geometry manager.  The value may be specified in any
-of the forms described in the COORDINATES section below.
+of the forms described in the \fBCOORDINATES\fR section below.
 .OP \-scrollregion scrollRegion ScrollRegion
 Specifies a list with four coordinates describing the left, top, right, and
 bottom coordinates of a rectangular region.
 This region is used for scrolling purposes and is considered to be
 the boundary of the information in the canvas.
 Each of the coordinates may be specified
-in any of the forms given in the COORDINATES section below.
+in any of the forms given in the \fBCOORDINATES\fR section below.
 .OP \-state state State
 Modifies the default state of the canvas where \fIstate\fR may be set to
 one of: \fBnormal\fR, \fBdisabled\fR, or \fBhidden\fR. Individual canvas
@@ -60,7 +60,7 @@ the appearence when the state is disabled.  Canvas items which are
 .OP \-width width width
 Specifies a desired window width that the canvas widget should request from
 its geometry manager.  The value may be specified in any
-of the forms described in the COORDINATES section below.
+of the forms described in the \fBCOORDINATES\fR section below.
 .OP \-xscrollincrement xScrollIncrement ScrollIncrement
 Specifies an increment for horizontal scrolling, in any of the usual forms
 permitted for screen distances.  If the value of this option is greater
@@ -1045,7 +1045,7 @@ See "DASH PATTERNS" for more information.
 The starting \fIoffset\fR in pixels into the pattern provided by the
 \fB\-dash\fR option.  \fB\-dashoffset\fR is ignored if there is no
 \fB-dash\fR pattern.  The \fIoffset\fR may have any of the forms described
-in the COORDINATES section above.
+in the \fBCOORDINATES\fR section above.
 .TP
 \fB\-fill \fIcolor\fR
 .TP
@@ -1130,8 +1130,8 @@ existing tags for the item.  \fITagList\fR may be an empty list.
 \fB\-disabledwidth \fIoutlineWidth\fR
 Specifies the width of the outline to be drawn around
 the item's region, in its normal, active and disabled states.
-\fIoutlineWidth\fR may be in any of the forms described in the COORDINATES
-section above.
+\fIoutlineWidth\fR may be in any of the forms described in the
+\fBCOORDINATES\fR section above.
 If the \fB\-outline\fR option has been specified as an empty string then
 this option has no effect.  This option defaults to 1.0.
 For arcs, wide outlines will be drawn centered on the edges of the
@@ -1368,7 +1368,7 @@ This option defaults to \fBnone\fR.
 This option indicates how to draw arrowheads.
 The \fIshape\fR argument must be a list with three elements, each
 specifying a distance in any of the forms described in
-the COORDINATES section above.
+the \fBCOORDINATES\fR section above.
 The first element of the list gives the distance along the line
 from the neck of the arrowhead to its tip.
 The second element gives the distance along the line from the
@@ -1673,7 +1673,7 @@ This option defaults to an empty string.
 .TP
 \fB\-width \fIlineLength\fR
 Specifies a maximum line length for the text, in any of the forms
-described in the COORDINATES section above.
+described in the \fBCOORDINATES\fR section above.
 If this option is zero (the default) the text is broken into
 lines only at newline characters.
 However, if this option is non-zero then any line that would
@@ -1718,14 +1718,14 @@ This option defaults to \fBcenter\fR.
 \fB\-height \fIpixels\fR
 Specifies the height to assign to the item's window.
 \fIPixels\fR may have any of the
-forms described in the COORDINATES section above.
+forms described in the \fBCOORDINATES\fR section above.
 If this option isn't specified, or if it is specified as an empty
 string, then the window is given whatever height it requests internally.
 .TP
 \fB\-width \fIpixels\fR
 Specifies the width to assign to the item's window.
 \fIPixels\fR may have any of the
-forms described in the COORDINATES section above.
+forms described in the \fBCOORDINATES\fR section above.
 If this option isn't specified, or if it is specified as an empty
 string, then the window is given whatever width it requests internally.
 .TP
diff --git a/doc/getOpenFile.n b/doc/getOpenFile.n
index a049b0a..65fb110 100644
--- a/doc/getOpenFile.n
+++ b/doc/getOpenFile.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: getOpenFile.n,v 1.12 2004/08/20 10:56:36 dkf Exp $
+'\" RCS: @(#) $Id: getOpenFile.n,v 1.13 2004/09/19 16:05:37 dkf Exp $
 '\" 
 .so man.macros
 .TH tk_getOpenFile n 4.2 Tk "Tk Built-In Commands"
@@ -55,7 +55,7 @@ the user choose a filetype in the listbox, only the files of that type
 are listed. If this option is unspecified, or if it is set to the
 empty list, or if the \fBFile types\fR listbox is not supported by the
 particular platform then all files are listed regardless of their
-types. See the section SPECIFYING FILE PATTERNS below for a
+types. See the section \fBSPECIFYING FILE PATTERNS\fR below for a
 discussion on the contents of \fIfilePatternList\fR.
 .TP
 \fB\-initialdir\fR \fIdirectory\fR
diff --git a/doc/grid.n b/doc/grid.n
index da9800a..0cda2c3 100644
--- a/doc/grid.n
+++ b/doc/grid.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: grid.n,v 1.11 2004/08/20 10:56:36 dkf Exp $
+'\" RCS: @(#) $Id: grid.n,v 1.12 2004/09/19 16:05:37 dkf Exp $
 '\" 
 .so man.macros
 .TH grid n 8.5 Tk "Tk Built-In Commands"
@@ -28,7 +28,7 @@ on the \fIoption\fR argument:
 If the first argument to \fBgrid\fR is suitable as the first slave
 argument to \fBgrid configure\fR, either a window name (any value
 starting with \fB.\fP) or one of the characters \fBx\fP or \fB^\fP 
-(see the ``RELATIVE PLACEMENT'' section below), then the command is
+(see the \fBRELATIVE PLACEMENT\fR section below), then the command is
 processed in the same way as \fBgrid configure\fR.
 .VS 8.5
 .TP
@@ -92,7 +92,7 @@ followed by pairs of arguments that specify how
 to manage the slaves.
 The characters \fB\-\fP,  \fBx\fP and \fB^\fP, 
 can be specified instead of a window name to alter the default
-location of a \fIslave\fP, as described in the ``RELATIVE PLACEMENT''
+location of a \fIslave\fP, as described in the \fBRELATIVE PLACEMENT\fR
 section, below.
 The following options are supported:
 .RS
diff --git a/doc/options.n b/doc/options.n
index 52b5308..29477c4 100644
--- a/doc/options.n
+++ b/doc/options.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: options.n,v 1.8 2004/08/20 14:15:29 dkf Exp $
+'\" RCS: @(#) $Id: options.n,v 1.9 2004/09/19 16:05:37 dkf Exp $
 '\" 
 .so man.macros
 .TH options n 4.4 Tk "Tk Built-In Commands"
@@ -252,7 +252,7 @@ communicate with the window manager so that when the user interactively
 resizes the top-level window that contains the widget, the dimensions of
 the window will be displayed to the user in grid units and the window
 size will be constrained to integral numbers of grid units.
-See the section GRIDDED GEOMETRY MANAGEMENT in the \fBwm\fR manual
+See the section \fBGRIDDED GEOMETRY MANAGEMENT\fR in the \fBwm\fR manual
 entry for more details.
 .OP \-takefocus takeFocus TakeFocus
 Determines whether the window accepts the focus during keyboard
diff --git a/doc/scale.n b/doc/scale.n
index 4fd2ac3..3a51a5f 100644
--- a/doc/scale.n
+++ b/doc/scale.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: scale.n,v 1.4 2004/08/17 22:37:24 dkf Exp $
+'\" RCS: @(#) $Id: scale.n,v 1.5 2004/09/19 16:05:37 dkf Exp $
 '\" 
 .so man.macros
 .TH scale n 4.1 Tk "Tk Built-In Commands"
@@ -117,7 +117,7 @@ of real values (determined by the \fBfrom\fR, \fBto\fR, and
 \fBresolution\fR options),
 and the position of the slider selects a particular real value.
 The slider's position (and hence the scale's value) may be adjusted
-with the mouse or keyboard as described in the BINDINGS
+with the mouse or keyboard as described in the \fBBINDINGS\fR
 section below.  Whenever the scale's value is changed, a Tcl
 command is invoked (using the \fBcommand\fR option) to notify
 other interested widgets of the change.
diff --git a/doc/scrollbar.n b/doc/scrollbar.n
index f4f86b0..b6c24ea 100644
--- a/doc/scrollbar.n
+++ b/doc/scrollbar.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: scrollbar.n,v 1.4 2004/08/17 22:37:24 dkf Exp $
+'\" RCS: @(#) $Id: scrollbar.n,v 1.5 2004/09/19 16:05:37 dkf Exp $
 '\" 
 .so man.macros
 .TH scrollbar n 4.1 Tk "Tk Built-In Commands"
@@ -78,7 +78,7 @@ between the two arrows, it means that the associated window displays
 the top third of its document.
 .PP
 Scrollbars can be used to adjust the view in the associated window
-by clicking or dragging with the mouse.  See the BINDINGS section
+by clicking or dragging with the mouse.  See the \fBBINDINGS\fR section
 below for details.
 
 .SH "ELEMENTS"
diff --git a/doc/text.n b/doc/text.n
index 7ce4e6a..59de0b1 100644
--- a/doc/text.n
+++ b/doc/text.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: text.n,v 1.28 2004/09/10 12:13:40 vincentdarley Exp $
+'\" RCS: @(#) $Id: text.n,v 1.29 2004/09/19 16:05:37 dkf Exp $
 '\" 
 .so man.macros
 .TH text n 8.5 Tk "Tk Built-In Commands"
@@ -1263,7 +1263,7 @@ The following forms of the command are currently supported:
 Returns the value of a configuration option for an embedded image.
 \fIIndex\fR identifies the embedded image, and \fIoption\fR
 specifies a particular configuration option, which must be one of
-the ones listed in the section EMBEDDED IMAGES.
+the ones listed in the section \fBEMBEDDED IMAGES\fR.
 .TP
 \fIpathName \fBimage configure \fIindex\fR ?\fIoption value ...\fR?
 Query or modify the configuration options for an embedded image.
@@ -1750,7 +1750,7 @@ The following forms of the command are currently supported:
 Returns the value of a configuration option for an embedded window.
 \fIIndex\fR identifies the embedded window, and \fIoption\fR
 specifies a particular configuration option, which must be one of
-the ones listed in the section EMBEDDED WINDOWS.
+the ones listed in the section \fBEMBEDDED WINDOWS\fR.
 .TP
 \fIpathName \fBwindow configure \fIindex\fR ?\fIoption value ...\fR?
 Query or modify the configuration options for an embedded window.