merge updates from HEAD

14 files changed, 30 insertions, 42 deletions

diff --git a/doc/AddOption.3 b/doc/AddOption.3
index eccc8f2..d084e08 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.4 2007/01/05 00:00:49 nijtmans Exp $
+'\" RCS: @(#) $Id: AddOption.3,v 1.4.2.1 2007/12/10 18:39:27 dgp Exp $
 '\" 
 '\"
 .so man.macros
@@ -39,22 +39,17 @@ this value will be returned in calls to \fBTk_GetOption\fR.
 queried using \fBTk_GetOption\fR, the value with the highest priority
 is returned.  \fIPriority\fR must be between 0 and \fBTK_MAX_PRIO\fR.  Some
 common priority values are:
-.TP
-20
+.IP 20
 Used for default values hard-coded into widgets.
-.TP
-40
+.IP 40
 Used for options specified in application-specific startup files.
-.TP
-60
+.IP 60
 Used for options specified in user-specific defaults files, such as
 \fB.Xdefaults\fR, resource databases loaded into the X server, or
 user-specific startup files.
-.TP
-80
+.IP 80
 Used for options specified interactively after the application starts
 running.
-.PP
 
 .SH KEYWORDS
 class, name, option, add
diff --git a/doc/CrtImgType.3 b/doc/CrtImgType.3
index 88b9b82..6cb4363 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.11 2007/05/14 20:58:25 dgp Exp $
+'\" RCS: @(#) $Id: CrtImgType.3,v 1.11.2.1 2007/12/10 18:39:27 dgp Exp $
 '\" 
 .so man.macros
 .TH Tk_CreateImageType 3 8.5 Tk "Tk Library Procedures"
@@ -250,8 +250,7 @@ and the return value is the ClientData value returned by the
 pointer to the image master data structure).  If no such image exists
 then NULL is returned and NULL is stored at \fI*typePtrPtr\fR.
 
-.SH LEGACY INTERFACE SUPPORT
-.PP
+.SH "LEGACY INTERFACE SUPPORT"
 In Tk 8.2 and earlier, the definition of \fBTk_ImageCreateProc\fR
 was incompatibly different, with the following prototype:
 .CS
diff --git a/doc/CrtPhImgFmt.3 b/doc/CrtPhImgFmt.3
index d640315..e110f5c 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.8 2007/05/14 20:58:25 dgp Exp $
+'\" RCS: @(#) $Id: CrtPhImgFmt.3,v 1.8.2.1 2007/12/10 18:39:27 dgp Exp $
 '\"
 .so man.macros
 .TH Tk_CreatePhotoImageFormat 3 8.5 Tk "Tk Library Procedures"
@@ -231,8 +231,7 @@ after the name of the format.  If appropriate, the
 characters to specify further details about the image file.
 The return value is a standard Tcl return value.
 
-.SH LEGACY INTERFACE SUPPORT
-.PP
+.SH "LEGACY INTERFACE SUPPORT"
 In Tk 8.2 and earlier, the definition of all the function pointer
 types stored in fields of a \fBTk_PhotoImageFormat\fR struct were
 incompatibly different.  Legacy programs and libraries dating from
diff --git a/doc/InternAtom.3 b/doc/InternAtom.3
index 3daa073..ba5cc3b 100644
--- a/doc/InternAtom.3
+++ b/doc/InternAtom.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: InternAtom.3,v 1.4.2.1 2007/11/01 16:37:13 dgp Exp $
+'\" RCS: @(#) $Id: InternAtom.3,v 1.4.2.2 2007/12/10 18:39:28 dgp Exp $
 '\" 
 .so man.macros
 .TH Tk_InternAtom 3 "" Tk "Tk Library Procedures"
@@ -45,7 +45,7 @@ not free this space when finished with the string, and the caller
 should not modify the contents of the returned string.
 If there is no atom \fIatom\fR on \fItkwin\fR's display,
 then \fBTk_GetAtomName\fR returns the string
-.QW ?bad atom? .
+.QW "?bad atom?" .
 .PP
 Tk caches
 the information returned by \fBTk_InternAtom\fR and \fBTk_GetAtomName\fR
diff --git a/doc/TextLayout.3 b/doc/TextLayout.3
index 3039857..6f4b164 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.7.2.1 2007/11/01 16:37:13 dgp Exp $
+'\" RCS: @(#) $Id: TextLayout.3,v 1.7.2.2 2007/12/10 18:39:28 dgp Exp $
 '\" 
 .so man.macros
 .TH Tk_ComputeTextLayout 3 8.1 Tk "Tk Library Procedures"
@@ -234,8 +234,7 @@ is the responsibility of the caller to take the Postscript array of
 strings and add some Postscript function operate on the array to render
 each of the lines.  The code that represents the Postscript array of
 strings is appended to \fIinterp->result\fR.
-.PP
-.SH DISPLAY MODEL
+.SH "DISPLAY MODEL"
 When measuring a text layout, space characters that occur at the end of a
 line are ignored.  The space characters still exist and the insertion point
 can be positioned amongst them, but their additional width is ignored when
diff --git a/doc/chooseColor.n b/doc/chooseColor.n
index afff881..56bbb6d 100644
--- a/doc/chooseColor.n
+++ b/doc/chooseColor.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: chooseColor.n,v 1.3 2002/10/02 21:12:41 hobbs Exp $
+'\" RCS: @(#) $Id: chooseColor.n,v 1.3.8.1 2007/12/10 18:39:28 dgp Exp $
 '\" 
 .so man.macros
 .TH tk_chooseColor n 4.2 Tk "Tk Built-In Commands"
@@ -12,7 +12,6 @@
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME
 tk_chooseColor \- pops up a dialog box for the user to select a color.
-.PP
 .SH SYNOPSIS
 \fBtk_chooseColor \fR?\fIoption value ...\fR?
 .BE
diff --git a/doc/chooseDirectory.n b/doc/chooseDirectory.n
index e28515e..2f9e39a 100644
--- a/doc/chooseDirectory.n
+++ b/doc/chooseDirectory.n
@@ -2,7 +2,7 @@
 '\" Copyright (c) 1998-2000 by Scriptics Corporation.
 '\" All rights reserved.
 '\" 
-'\" RCS: @(#) $Id: chooseDirectory.n,v 1.4.2.4 2007/11/05 14:24:16 dgp Exp $
+'\" RCS: @(#) $Id: chooseDirectory.n,v 1.4.2.5 2007/12/10 18:39:28 dgp Exp $
 '\" 
 .so man.macros
 .TH tk_chooseDirectory n 8.3 Tk "Tk Built-In Commands"
@@ -10,7 +10,6 @@
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME
 tk_chooseDirectory \- pops up a dialog box for the user to select a directory.
-.PP
 .SH SYNOPSIS
 \fBtk_chooseDirectory \fR?\fIoption value ...\fR?
 .BE
diff --git a/doc/loadTk.n b/doc/loadTk.n
index 5aa29a3..6d6b8cb 100644
--- a/doc/loadTk.n
+++ b/doc/loadTk.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: loadTk.n,v 1.7.2.1 2007/11/01 16:37:15 dgp Exp $
+'\" RCS: @(#) $Id: loadTk.n,v 1.7.2.2 2007/12/10 18:39:28 dgp Exp $
 '\" 
 .so man.macros
 .TH "Safe Tk" n 8.0 Tk "Tk Built-In Commands"
@@ -15,15 +15,13 @@ loadTk \- Load Tk into a safe interpreter.
 .SH SYNOPSIS
 \fB::safe::loadTk \fIslave\fR ?\fB\-use\fR \fIwindowId\fR? ?\fB\-display\fR \fIdisplayName\fR? 
 .BE
-
+.SH DESCRIPTION
 Safe Tk is based on Safe Tcl, which provides a mechanism 
 that allows restricted and mediated
 access to auto-loading and packages for safe interpreters.
 Safe Tk adds the ability to configure the interpreter
 for safe Tk operations and load Tk into safe 
 interpreters.
-
-.SH DESCRIPTION
 .PP
 The \fB::safe::loadTk\fR command initializes the required data structures
 in the named safe interpreter and then loads Tk into it.
diff --git a/doc/palette.n b/doc/palette.n
index 627735a..205a7de 100644
--- a/doc/palette.n
+++ b/doc/palette.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: palette.n,v 1.2.32.2 2007/11/02 14:51:39 dgp Exp $
+'\" RCS: @(#) $Id: palette.n,v 1.2.32.3 2007/12/10 18:39:28 dgp Exp $
 '\" 
 .so man.macros
 .TH tk_setPalette n 4.0 Tk "Tk Built-In Commands"
@@ -34,7 +34,7 @@ of \fIname\fR\-\fIvalue\fR pairs, where the first argument of the pair
 is the name of an option in the Tk option database and the second
 argument is the new value to use for that option.  The following
 database names are currently supported:
-.DS L
+.DS
 .ta 4c 8c
 \fBactiveBackground\fR	\fBforeground\fR	\fBselectColor\fR
 \fBactiveForeground\fR	\fBhighlightBackground\fR	\fBselectBackground\fR
diff --git a/doc/ttk_combobox.n b/doc/ttk_combobox.n
index 6cc219a..8a23fab 100644
--- a/doc/ttk_combobox.n
+++ b/doc/ttk_combobox.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: ttk_combobox.n,v 1.4.2.5 2007/11/02 14:51:39 dgp Exp $
+'\" RCS: @(#) $Id: ttk_combobox.n,v 1.4.2.6 2007/12/10 18:39:28 dgp Exp $
 '\"
 .so man.macros
 .TH ttk::combobox n 8.5 Tk "Tk Themed Widget"
@@ -53,7 +53,6 @@ Specifies the list of values to display in the drop-down listbox.
 .OP \-width width Width
 Specifies an integer value indicating the desired width of the entry window,
 in average-size characters of the widget's font.
-.BE
 .SH "WIDGET COMMAND"
 .TP
 \fIpathName \fBcget\fR \fIoption\fR
diff --git a/doc/ttk_entry.n b/doc/ttk_entry.n
index e30423e..df60f2c 100644
--- a/doc/ttk_entry.n
+++ b/doc/ttk_entry.n
@@ -7,7 +7,7 @@
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
 '\" SOURCE: entry.n, r1.12
-'\" RCS: @(#) $Id: ttk_entry.n,v 1.3.2.3 2007/11/01 16:37:16 dgp Exp $
+'\" RCS: @(#) $Id: ttk_entry.n,v 1.3.2.4 2007/12/10 18:39:28 dgp Exp $
 '\" 
 .so man.macros
 .TH ttk::entry n 8.5 Tk "Tk Themed Widget"
@@ -87,7 +87,6 @@ Specifies an integer value indicating the desired width of the entry window,
 in average-size characters of the widget's font.
 .\" Not in ttk: If the value is less than or equal to zero, the widget picks a
 .\" Not in ttk: size just large enough to hold its current text.
-.BE
 .SH NOTES
 A portion of the entry may be selected as described below.
 If an entry is exporting its selection (see the \fBexportSelection\fR
diff --git a/doc/ttk_scrollbar.n b/doc/ttk_scrollbar.n
index 76a77ba..57a8cf5 100644
--- a/doc/ttk_scrollbar.n
+++ b/doc/ttk_scrollbar.n
@@ -6,7 +6,7 @@
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
 '\" SOURCE: tk/doc/scrollbar.n, r1.4
-'\" RCS: @(#) $Id: ttk_scrollbar.n,v 1.3.2.3 2007/11/01 16:37:16 dgp Exp $
+'\" RCS: @(#) $Id: ttk_scrollbar.n,v 1.3.2.4 2007/12/10 18:39:28 dgp Exp $
 '\" 
 .so man.macros
 .TH ttk::scrollbar n 8.5 Tk "Tk Themed Widget"
@@ -46,7 +46,6 @@ or \fByview\fR (for vertical scrollbars).
 .OP \-orient orient Orient
 One of \fBhorizontal\fR or \fBvertical\fR.
 Specifies the orientation of the scrollbar.
-.BE
 .SH "WIDGET COMMAND"
 .TP
 \fIpathName \fBcget\fR \fIoption\fR
diff --git a/doc/ttk_treeview.n b/doc/ttk_treeview.n
index be324a4..ad6f924 100644
--- a/doc/ttk_treeview.n
+++ b/doc/ttk_treeview.n
@@ -4,10 +4,11 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ttk_treeview.n,v 1.5.2.3 2007/11/01 16:37:16 dgp Exp $
+'\" RCS: @(#) $Id: ttk_treeview.n,v 1.5.2.4 2007/12/10 18:39:28 dgp Exp $
 '\" 
 .so man.macros
 .TH ttk::treeview n 8.5 Tk "Tk Themed Widget"
+.BS
 .SH NAME
 ttk::treeview \- hierarchical multicolumn data display widget
 .SH SYNOPSIS
@@ -135,9 +136,8 @@ The following options may be set on each column:
 .TP
 \fB\-id \fIname\fR
 The column name.  This is a read-only option.
-For example,
-.QW \fI$pathname \fBcolumn #\fIn \fB\-id\fR]
-returns the data column associated with data column #\fIn\fR. 
+For example, [\fI$pathname \fBcolumn #\fIn \fB\-id\fR]
+returns the data column associated with display column #\fIn\fR. 
 .TP
 \fB\-anchor\fR
 Specifies how the text in this column should be aligned
diff --git a/doc/wm.n b/doc/wm.n
index 058fa7a..e74c335 100644
--- a/doc/wm.n
+++ b/doc/wm.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: wm.n,v 1.29.2.4 2007/11/01 16:37:16 dgp Exp $
+'\" RCS: @(#) $Id: wm.n,v 1.29.2.5 2007/12/10 18:39:28 dgp Exp $
 '\" 
 .so man.macros
 .TH wm n 8.5 Tk "Tk Built-In Commands"
@@ -105,6 +105,9 @@ Specifies the modification state of the window (determines whether the
 window close widget contains the modification indicator and whether the
 proxy icon is draggable).
 .TP
+\fB\-notify\fR
+Specifies process notification state (bouncing of the application dock icon).
+.TP
 \fB\-titlepath\fR
 Specifies the path of the file referenced as the window proxy icon (which
 can be dragged and dropped in lieu of the file's finder icon).