merge updates from HEAD

5 files changed, 71 insertions, 71 deletions

diff --git a/doc/bind.n b/doc/bind.n
index 4b0d182..2b81c22 100644
--- a/doc/bind.n
+++ b/doc/bind.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: bind.n,v 1.20.2.2 2007/11/01 16:37:13 dgp Exp $
+'\" RCS: @(#) $Id: bind.n,v 1.20.2.3 2007/11/02 14:51:39 dgp Exp $
 '\" 
 .so man.macros
 .TH bind n 8.0 Tk "Tk Built-In Commands"
@@ -105,16 +105,16 @@ manual page for each widget for details.
 Modifiers consist of any of the following values:
 .DS
 .ta 6c
-\fBControl\fR	\fBMod1, M1, Command\fR	    
-\fBAlt\fR	\fBMod2, M2, Option\fR
-\fBShift\fR	\fBMod3, M3\fR
-\fBLock\fR	\fBMod4, M4\fR
-\fBExtended\fR	\fBMod5, M5\fR
-\fBButton1, B1\fR	\fBMeta, M\fR
-\fBButton2, B2\fR	\fBDouble\fR
-\fBButton3, B3\fR	\fBTriple\fR
-\fBButton4, B4\fR	\fBQuadruple\fR
-\fBButton5, B5\fR
+\fBControl\fR	\fBMod1\fR, \fBM1\fR, \fBCommand\fR
+\fBAlt\fR	\fBMod2\fR, \fBM2\fR, \fBOption\fR
+\fBShift\fR	\fBMod3\fR, \fBM3\fR
+\fBLock\fR	\fBMod4\fR, \fBM4\fR
+\fBExtended\fR	\fBMod5\fR, \fBM5\fR
+\fBButton1\fR, \fBB1\fR	\fBMeta\fR, \fBM\fR
+\fBButton2\fR, \fBB2\fR	\fBDouble\fR
+\fBButton3\fR, \fBB3\fR	\fBTriple\fR
+\fBButton4\fR, \fBB4\fR	\fBQuadruple\fR
+\fBButton5\fR, \fBB5\fR
 .DE
 Where more than one value is listed, separated by commas, the values
 are equivalent.
@@ -171,17 +171,17 @@ couple non-standard X event types that were added to better support
 the Macintosh and Windows platforms.  Below is a list of all the valid
 types; where two names appear together, they are synonyms.
 .DS
-.ta \w'ButtonPress, Button\0\0\0'u +\w'KeyPress, Key\0\0\0'u
-\fBActivate	Destroy	Map
-ButtonPress, Button	Enter	MapRequest
-ButtonRelease	Expose	Motion
-Circulate	FocusIn	MouseWheel
-CirculateRequest	FocusOut	Property
-Colormap	Gravity	Reparent
-Configure	KeyPress, Key	ResizeRequest
-ConfigureRequest	KeyRelease	Unmap
-Create	Leave	Visibility
-Deactivate\fR
+.ta \w'\fBButtonPress, Button\0\0\0\fR'u +\w'\fBKeyPress, Key\0\0\0\fR'u
+\fBActivate\fR	\fBDestroy\fR	\fBMap\fR
+\fBButtonPress\fR, \fBButton\fR	\fBEnter\fR	\fBMapRequest\fR
+\fBButtonRelease\fR	\fBExpose\fR	\fBMotion\fR
+\fBCirculate\fR	\fBFocusIn\fR	\fBMouseWheel\fR
+\fBCirculateRequest\fR	\fBFocusOut\fR	\fBProperty\fR
+\fBColormap\fR	\fBGravity\fR	\fBReparent\fR
+\fBConfigure\fR	\fBKeyPress\fR, \fBKey\fR	\fBResizeRequest\fR
+\fBConfigureRequest\fR	\fBKeyRelease\fR	\fBUnmap\fR
+\fBCreate\fR	\fBLeave\fR	\fBVisibility\fR
+\fBDeactivate\fR
 .DE
 Most of the above events have the same fields and behaviors as events
 in the X Windowing system.  You can find more detailed descriptions of
@@ -442,17 +442,17 @@ the string will be one of the following:
 .RS
 .DS
 .ta 6c
-\fBNotifyAncestor	NotifyNonlinearVirtual
-NotifyDetailNone	NotifyPointer
-NotifyInferior	NotifyPointerRoot
-NotifyNonlinear	NotifyVirtual\fR
+\fBNotifyAncestor\fR	\fBNotifyNonlinearVirtual\fR
+\fBNotifyDetailNone\fR	\fBNotifyPointer\fR
+\fBNotifyInferior\fR	\fBNotifyPointerRoot\fR
+\fBNotifyNonlinear\fR	\fBNotifyVirtual\fR
 .DE
 For \fBConfigureRequest\fR events, the string will be one of:
 .DS
 .ta 6c
-\fBAbove	Opposite
-Below	None
-BottomIf	TopIf\fR
+\fBAbove\fR	\fBOpposite\fR
+\fBBelow\fR	\fBNone\fR
+\fBBottomIf\fR	\fBTopIf\fR
 .DE
 .VS 8.5
 For virtual events, the string will be whatever value is stored in the
diff --git a/doc/event.n b/doc/event.n
index 439357e..2c729e5 100644
--- a/doc/event.n
+++ b/doc/event.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: event.n,v 1.12.2.1 2007/11/01 16:37:14 dgp Exp $
+'\" RCS: @(#) $Id: event.n,v 1.12.2.2 2007/11/02 14:51:39 dgp Exp $
 '\" 
 .so man.macros
 .TH event n 8.3 Tk "Tk Built-In Commands"
@@ -130,10 +130,10 @@ and must be one of the following:
 .RS
 .DS
 .ta 6c
-\fBNotifyAncestor	NotifyNonlinearVirtual
-NotifyDetailNone	NotifyPointer
-NotifyInferior	NotifyPointerRoot
-NotifyNonlinear	NotifyVirtual\fR
+\fBNotifyAncestor\fR	\fBNotifyNonlinearVirtual\fR
+\fBNotifyDetailNone\fR	\fBNotifyPointer\fR
+\fBNotifyInferior\fR	\fBNotifyPointerRoot\fR
+\fBNotifyNonlinear\fR	\fBNotifyVirtual\fR
 .DE
 Valid for \fBEnter\fR, \fBLeave\fR, \fBFocusIn\fR and
 \fBFocusOut\fR events.
diff --git a/doc/font.n b/doc/font.n
index d4a135e..964851c 100644
--- a/doc/font.n
+++ b/doc/font.n
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: font.n,v 1.11.2.3 2007/11/01 16:37:14 dgp Exp $
+'\" RCS: @(#) $Id: font.n,v 1.11.2.4 2007/11/02 14:51:39 dgp Exp $
 '\" 
 .so man.macros
 .TH font n 8.0 Tk "Tk Built-In Commands"
@@ -139,8 +139,8 @@ for the \fIstyle\fR arguments are as follows:
 .RS
 .DS
 .ta 3c 6c 9c
-\fBnormal	bold	roman	italic
-underline	overstrike\fR
+\fBnormal\fR	\fBbold\fR	\fBroman\fR	\fBitalic\fR
+\fBunderline\fR	\fBoverstrike\fR
 .DE
 .RE
 .TP
@@ -332,46 +332,46 @@ It is \fInot\fR advised to change these fonts, as they may be modified by Tk
 itself in response to system changes. Instead, make a copy of the font and
 modify that.
 .SH "PLATFORM-SPECIFIC FONTS"
-.LP
+.PP
 The following system fonts are supported:
-.RS
 .TP
 \fBX Windows\fR
 All valid X font names, including those listed by xlsfonts(1), are available.
 .TP
 \fBMS Windows\fR
+The following fonts are supported, and are mapped to the user's
+style defaults.
+.RS
 .DS
 .ta 3c 6c
-\fBsystem	ansi	device
-systemfixed	ansifixed	oemfixed\fR
+\fBsystem\fR	\fBansi\fR	\fBdevice\fR
+\fBsystemfixed\fR	\fBansifixed\fR	\fBoemfixed\fR
 .DE
+.RE
 .TP
 \fBMac OS X\fR
+The following fonts are supported, and are mapped to the user's
+style defaults.
+.RS
 .DS
 .ta 3c 6c
-\fBsystem	application	menu\fR
+\fBsystem\fR	\fBapplication\fR	\fBmenu\fR
 .DE
-Additionally, the following named fonts provide access to the Aqua theme fonts:
+.PP
+Additionally, the following named fonts provide access to the Aqua
+theme fonts:
 .DS
-\fBsystemSystemFont
-systemEmphasizedSystemFont
-systemSmallSystemFont
-systemSmallEmphasizedSystemFont
-systemApplicationFont
-systemLabelFont
-systemViewsFont
-systemMenuTitleFont
-systemMenuItemFont
-systemMenuItemMarkFont
-systemMenuItemCmdKeyFont
-systemWindowTitleFont
-systemPushButtonFont
-systemUtilityWindowTitleFont
-systemAlertHeaderFont
-systemToolbarFont
-systemMiniSystemFont
-systemDetailSystemFont
-systemDetailEmphasizedSystemFont\fR
+.ta 5c
+\fBsystemSystemFont\fR	\fBsystemEmphasizedSystemFont\fR
+\fBsystemSmallSystemFont\fR	\fBsystemSmallEmphasizedSystemFont\fR
+\fBsystemApplicationFont\fR	\fBsystemLabelFont\fR
+\fBsystemViewsFont\fR	\fBsystemMenuTitleFont\fR
+\fBsystemMenuItemFont\fR	\fBsystemMenuItemMarkFont\fR
+\fBsystemMenuItemCmdKeyFont\fR	\fBsystemWindowTitleFont\fR
+\fBsystemPushButtonFont\fR	\fBsystemUtilityWindowTitleFont\fR
+\fBsystemAlertHeaderFont\fR	\fBsystemToolbarFont\fR
+\fBsystemMiniSystemFont\fR	\fBsystemDetailSystemFont\fR
+\fBsystemDetailEmphasizedSystemFont\fR
 .DE
 .RE
 .SH EXAMPLE
diff --git a/doc/palette.n b/doc/palette.n
index aa44360..627735a 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.1 2007/11/01 16:37:15 dgp Exp $
+'\" RCS: @(#) $Id: palette.n,v 1.2.32.2 2007/11/02 14:51:39 dgp Exp $
 '\" 
 .so man.macros
 .TH tk_setPalette n 4.0 Tk "Tk Built-In Commands"
@@ -36,10 +36,10 @@ argument is the new value to use for that option.  The following
 database names are currently supported:
 .DS L
 .ta 4c 8c
-\fBactiveBackground	foreground	selectColor
-activeForeground	highlightBackground	selectBackground
-background	highlightColor	selectForeground
-disabledForeground	insertBackground	troughColor\fR
+\fBactiveBackground\fR	\fBforeground\fR	\fBselectColor\fR
+\fBactiveForeground\fR	\fBhighlightBackground\fR	\fBselectBackground\fR
+\fBbackground\fR	\fBhighlightColor\fR	\fBselectForeground\fR
+\fBdisabledForeground\fR	\fBinsertBackground\fR	\fBtroughColor\fR
 .DE
 \fBtk_setPalette\fR tries to compute reasonable defaults for any
 options that you do not specify.  You can specify options other
diff --git a/doc/ttk_combobox.n b/doc/ttk_combobox.n
index c2ea88e..6cc219a 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.4 2007/11/01 16:37:16 dgp Exp $
+'\" RCS: @(#) $Id: ttk_combobox.n,v 1.4.2.5 2007/11/02 14:51:39 dgp Exp $
 '\"
 .so man.macros
 .TH ttk::combobox n 8.5 Tk "Tk Themed Widget"
@@ -92,9 +92,9 @@ The combobox widget also supports the following \fIttk::entry\fR
 widget commands (see \fIttk::entry(n)\fR for details):
 .DS
 .ta 5.5c 11c
-bbox	delete	icursor
-index	insert	selection
-xview
+\fBbbox\fR	\fBdelete\fR	\fBicursor\fR
+\fBindex\fR	\fBinsert\fR	\fBselection\fR
+\fBxview\fR
 .DE
 .SH "VIRTUAL EVENTS"
 The combobox widget generates a \fB<<ComboboxSelected>>\fR virtual event