33 files changed, 146 insertions, 221 deletions
diff --git a/ChangeLog b/ChangeLog
index 65e888b..cf4b259 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-11-01  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
 
+	* unix/installManPage, doc/*.n: Make documentation use the name that
+	scripts use as much as possible. [Bug 1640073]
+
 	* doc/text.n: Fixed mistake in [$t tag remove] docs. [Bug 1792191]
 
 	* doc/bind.n: Documentated the Command modifier. [Bug 1232908]
diff --git a/doc/button.n b/doc/button.n
index d750516..5f1c1dc 100644
--- a/doc/button.n
+++ b/doc/button.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: button.n,v 1.13 2007/10/29 16:04:13 dkf Exp $
+'\" RCS: @(#) $Id: button.n,v 1.14 2007/11/01 10:59:42 dkf Exp $
 '\" 
 .so man.macros
 .TH button n 4.4 Tk "Tk Built-In Commands"
@@ -197,6 +197,6 @@ This example demonstrates how to handle button accelerators:
     pack .b1 .b2
 .CE
 .SH "SEE ALSO"
-ttk_button(n)
+ttk::button(n)
 .SH KEYWORDS
 button, widget
diff --git a/doc/checkbutton.n b/doc/checkbutton.n
index 037195f..f878047 100644
--- a/doc/checkbutton.n
+++ b/doc/checkbutton.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: checkbutton.n,v 1.17 2007/10/29 21:19:42 dkf Exp $
+'\" RCS: @(#) $Id: checkbutton.n,v 1.18 2007/11/01 10:59:42 dkf Exp $
 '\" 
 .so man.macros
 .TH checkbutton n 4.4 Tk "Tk Built-In Commands"
@@ -291,6 +291,6 @@ This example shows a group of uncoupled checkbuttons.
     pack .lbl
 .CE
 .SH "SEE ALSO"
-button(n), options(n), radiobutton(n), ttk_checkbutton(n)
+button(n), options(n), radiobutton(n), ttk::checkbutton(n)
 .SH KEYWORDS
 checkbutton, widget
diff --git a/doc/entry.n b/doc/entry.n
index 8ed48ad..2fc730d 100644
--- a/doc/entry.n
+++ b/doc/entry.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: entry.n,v 1.20 2007/10/30 21:29:58 dkf Exp $
+'\" RCS: @(#) $Id: entry.n,v 1.21 2007/11/01 10:59:42 dkf Exp $
 '\" 
 .so man.macros
 .TH entry n 8.3 Tk "Tk Built-In Commands"
@@ -532,9 +532,7 @@ entry whatever the value of its \fB\-state\fR option.
 .PP
 The behavior of entries can be changed by defining new bindings for
 individual widgets or by redefining the class bindings.
-
 .SH "SEE ALSO"
-ttk_entry(n)
-
+ttk::entry(n)
 .SH KEYWORDS
 entry, widget
diff --git a/doc/frame.n b/doc/frame.n
index 5391bb9..65506ac 100644
--- a/doc/frame.n
+++ b/doc/frame.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: frame.n,v 1.7 2007/10/29 16:04:13 dkf Exp $
+'\" RCS: @(#) $Id: frame.n,v 1.8 2007/11/01 10:59:42 dkf Exp $
 '\" 
 .so man.macros
 .TH frame n 8.4 Tk "Tk Built-In Commands"
@@ -78,7 +78,6 @@ not added.  Normally \fB\-width\fR should not be used if a propagating
 geometry manager, such as \fBgrid\fR or \fBpack\fR, is used within the
 frame since the geometry manager will override the width of the frame.
 .BE
-
 .SH DESCRIPTION
 .PP
 The \fBframe\fR command creates a new window (given by the
@@ -94,7 +93,6 @@ A frame is a simple widget.  Its primary purpose is to act as a
 spacer or container for complex window layouts.  The only features
 of a frame are its background color and an optional 3-D border to make the
 frame appear raised or sunken.
-
 .SH "WIDGET COMMAND"
 .PP
 The \fBframe\fR command creates a new Tcl command whose
@@ -128,14 +126,11 @@ modifies the given widget option(s) to have the given value(s);  in
 this case the command returns an empty string.
 \fIOption\fR may have any of the values accepted by the \fBframe\fR
 command.
-
 .SH BINDINGS
 .PP
 When a new frame is created, it has no default event bindings:
 frames are not intended to be interactive.
-
 .SH "SEE ALSO"
-labelframe(n), toplevel(n), ttk_frame(n)
-
+labelframe(n), toplevel(n), ttk::frame(n)
 .SH KEYWORDS
 frame, widget
diff --git a/doc/label.n b/doc/label.n
index b5d330c..07eaf7f 100644
--- a/doc/label.n
+++ b/doc/label.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: label.n,v 1.10 2007/10/29 16:04:13 dkf Exp $
+'\" RCS: @(#) $Id: label.n,v 1.11 2007/11/01 10:59:42 dkf Exp $
 '\" 
 .so man.macros
 .TH label n 4.0 Tk "Tk Built-In Commands"
@@ -49,7 +49,6 @@ for text it is in characters.
 If this option is not specified, the label's desired width is computed
 from the size of the image or bitmap or text being displayed in it.
 .BE
-
 .SH DESCRIPTION
 .PP
 The \fBlabel\fR command creates a new window (given by the
@@ -123,9 +122,7 @@ pack .l   \-side left   \-fill y
 pack .r   \-side right  \-fill y
 pack .mid \-expand 1    \-fill both
 .CE
-
 .SH "SEE ALSO"
-labelframe(n), button(n), ttk_label(n)
-
+labelframe(n), button(n), ttk::label(n)
 .SH KEYWORDS
 label, widget
diff --git a/doc/labelframe.n b/doc/labelframe.n
index 9b2112b..5846066 100644
--- a/doc/labelframe.n
+++ b/doc/labelframe.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: labelframe.n,v 1.6 2007/10/29 16:04:13 dkf Exp $
+'\" RCS: @(#) $Id: labelframe.n,v 1.7 2007/11/01 10:59:42 dkf Exp $
 '\" 
 .so man.macros
 .TH labelframe n 8.4 Tk "Tk Built-In Commands"
@@ -85,7 +85,6 @@ acceptable to \fBTk_GetPixels\fR.
 If this option is less than or equal to zero then the window will
 not request any size at all.
 .BE
-
 .SH DESCRIPTION
 .PP
 The \fBlabelframe\fR command creates a new window (given by the
@@ -177,9 +176,7 @@ set bun    white
 set cheese none
 set pickle none
 .CE
-
 .SH "SEE ALSO"
-frame(n), label(n), ttk_labelframe(n)
-
+frame(n), label(n), ttk::labelframe(n)
 .SH KEYWORDS
 labelframe, widget
diff --git a/doc/menu.n b/doc/menu.n
index 943b9b4..74a0f29 100644
--- a/doc/menu.n
+++ b/doc/menu.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: menu.n,v 1.19 2007/10/29 16:04:13 dkf Exp $
+'\" RCS: @(#) $Id: menu.n,v 1.20 2007/11/01 10:59:42 dkf Exp $
 '\" 
 .so man.macros
 .TH menu n 4.1 Tk "Tk Built-In Commands"
@@ -22,7 +22,6 @@ menu, tk_menuSetFocus \- Create and manipulate menu widgets
 \-activeborderwidth	\-cursor		\-relief
 \-activeforeground	\-disabledforeground	\-takefocus
 \-background	\-font
-
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-postcommand postCommand Command
@@ -68,7 +67,6 @@ changed, this does not affect the menu widget's behavior. This is used
 by the cloning mechanism and is not normally set outside of the Tk
 library.
 .BE
-
 .SH INTRODUCTION
 .PP
 The \fBmenu\fR command creates a new top-level window (given
@@ -751,9 +749,7 @@ individual widgets or by redefining the class bindings.
 At present it is not possible to use the
 option database to specify values for the options to individual
 entries.
-
 .SH "SEE ALSO"
-bind(n), menubutton(n), ttk_menubutton(n), toplevel(n)
-
+bind(n), menubutton(n), ttk::menubutton(n), toplevel(n)
 .SH KEYWORDS
 menu, widget
diff --git a/doc/menubutton.n b/doc/menubutton.n
index 8aa18de..ae3de7e 100644
--- a/doc/menubutton.n
+++ b/doc/menubutton.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: menubutton.n,v 1.8 2007/10/29 16:04:13 dkf Exp $
+'\" RCS: @(#) $Id: menubutton.n,v 1.9 2007/11/01 10:59:42 dkf Exp $
 '\" 
 .so man.macros
 .TH menubutton n 4.0 Tk "Tk Built-In Commands"
@@ -69,7 +69,6 @@ for text it is in characters.
 If this option is not specified, the menubutton's desired width is computed
 from the size of the image or bitmap or text being displayed in it.
 .BE
-
 .SH INTRODUCTION
 .PP
 The \fBmenubutton\fR command creates a new window (given by the
@@ -107,7 +106,6 @@ new menubutton is posted instead.
 There are several interactions between menubuttons and menus;  see
 the \fBmenu\fR manual entry for information on various menu configurations,
 such as pulldown menus and option menus.
-
 .SH "WIDGET COMMAND"
 .PP
 The \fBmenubutton\fR command creates a new Tcl command whose
@@ -140,7 +138,6 @@ modifies the given widget option(s) to have the given value(s);  in
 this case the command returns an empty string.
 \fIOption\fR may have any of the values accepted by the \fBmenubutton\fR
 command.
-
 .SH "DEFAULT BINDINGS"
 .PP
 Tk automatically creates class bindings for menubuttons that give them
@@ -190,9 +187,7 @@ actions occur:  the menubutton is completely non-responsive.
 .PP
 The behavior of menubuttons can be changed by defining new bindings for
 individual widgets or by redefining the class bindings.
-
 .SH "SEE ALSO"
-ttk_menubutton(n), menu(n)
-
+ttk::menubutton(n), menu(n)
 .SH KEYWORDS
 menubutton, widget
diff --git a/doc/panedwindow.n b/doc/panedwindow.n
index a8d0e4a..a5ef425 100644
--- a/doc/panedwindow.n
+++ b/doc/panedwindow.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: panedwindow.n,v 1.11 2007/10/29 16:04:14 dkf Exp $
+'\" RCS: @(#) $Id: panedwindow.n,v 1.12 2007/11/01 10:59:42 dkf Exp $
 '\" 
 .so man.macros
 .TH panedwindow n 8.4 Tk "Tk Built-In Commands"
@@ -48,7 +48,6 @@ Specifies the width of each sash.  May be any value accepted by
 Specifies whether sash handles should be shown.  May be any valid Tcl
 boolean value.
 .BE
-
 .SH DESCRIPTION
 .PP
 The \fBpanedwindow\fR command creates a new window (given by the
@@ -269,7 +268,6 @@ panedwindow.  \fISize\fR may be any value accepted by \fBTk_GetPixels\fR.
 .TP
 \fIpathName \fBpanes\fR
 Returns an ordered list of the widgets managed by \fIpathName\fR.
-
 .SH "RESIZING PANES"
 A pane is resized by grabbing the sash (or sash handle if present) and
 dragging with the mouse.  This is accomplished via mouse motion
@@ -280,9 +278,7 @@ adjusted.
 When a pane is resized from outside (e.g. it is packed to expand and
 fill, and the containing toplevel is resized), space is added to the final
 (rightmost or bottommost) pane in the window.
-
 .SH "SEE ALSO"
-ttk_panedwindow(n)
-
+ttk::panedwindow(n)
 .SH KEYWORDS
 panedwindow, widget, geometry management
diff --git a/doc/radiobutton.n b/doc/radiobutton.n
index 90a6419..d0e59a2 100644
--- a/doc/radiobutton.n
+++ b/doc/radiobutton.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: radiobutton.n,v 1.14 2007/10/29 16:04:14 dkf Exp $
+'\" RCS: @(#) $Id: radiobutton.n,v 1.15 2007/11/01 10:59:42 dkf Exp $
 '\" 
 .so man.macros
 .TH radiobutton n 4.4 Tk "Tk Built-In Commands"
@@ -118,7 +118,6 @@ for text it is in characters.
 If this option is not specified, the button's desired width is computed
 from the size of the image or bitmap or text being displayed in it.
 .BE
-
 .SH DESCRIPTION
 .PP
 The \fBradiobutton\fR command creates a new window (given by the
@@ -260,9 +259,7 @@ actions occur:  the radiobutton is completely non-responsive.
 .PP
 The behavior of radiobuttons can be changed by defining new bindings for
 individual widgets or by redefining the class bindings.
-
 .SH "SEE ALSO"
-checkbutton(n), labelframe(n), listbox(n), options(n), scale(n), ttk_radiobutton(n)
-
+checkbutton(n), labelframe(n), listbox(n), options(n), scale(n), ttk::radiobutton(n)
 .SH KEYWORDS
 radiobutton, widget
diff --git a/doc/scrollbar.n b/doc/scrollbar.n
index 71d5293..1665b0f 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.8 2007/10/29 16:04:14 dkf Exp $
+'\" RCS: @(#) $Id: scrollbar.n,v 1.9 2007/11/01 10:59:42 dkf Exp $
 '\" 
 .so man.macros
 .TH scrollbar n 4.1 Tk "Tk Built-In Commands"
@@ -340,6 +340,6 @@ grid columnconfigure .tl 0 \-weight 1
 grid rowconfigure .tl 0 \-weight 1
 .CE
 .SH "SEE ALSO"
-ttk_scrollbar(n)
+ttk:scrollbar(n)
 .SH KEYWORDS
 scrollbar, widget
diff --git a/doc/ttk_button.n b/doc/ttk_button.n
index 0a9215e..fb7e3c6 100644
--- a/doc/ttk_button.n
+++ b/doc/ttk_button.n
@@ -4,14 +4,13 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ttk_button.n,v 1.8 2007/10/30 21:29:59 dkf Exp $
+'\" RCS: @(#) $Id: ttk_button.n,v 1.9 2007/11/01 10:59:42 dkf Exp $
 '\" 
 .so man.macros
-.TH ttk_button n 8.5 Tk "Tk Themed Widget"
+.TH ttk::button n 8.5 Tk "Tk Themed Widget"
 .BS
-.\" Use _ instead of :: as the name becomes a filename on install
 .SH NAME
-ttk_button \- Widget that issues a command when pressed
+ttk::button \- Widget that issues a command when pressed
 .SH SYNOPSIS
 \fBttk::button\fR \fIpathName \fR?\fIoptions\fR?
 .BE
@@ -67,7 +66,7 @@ Invokes the command associated with the button.
 \fIpathName \fBinstate \fIstateSpec\fR ?\fIscript\fR?
 .TP
 \fIpathName \fBstate\fR ?\fIstateSpec\fR?
-See \fIttk_widget(n)\fR
+See \fIttk::widget(n)\fR
 .SH "COMPATIBILITY OPTIONS"
 .OP \-state state State
 May be set to \fBnormal\fR or \fBdisabled\fR to control the
@@ -76,6 +75,6 @@ May be set to \fBnormal\fR or \fBdisabled\fR to control the
 option: setting it changes the widget state, but the \fBstate\fR
 widget command does not affect the state option.
 .SH "SEE ALSO"
-ttk_widget(n), button(n)
+ttk::widget(n), button(n)
 .SH "KEYWORDS"
 widget, button, default, command
diff --git a/doc/ttk_checkbutton.n b/doc/ttk_checkbutton.n
index ec28dcd..2c36ad9 100644
--- a/doc/ttk_checkbutton.n
+++ b/doc/ttk_checkbutton.n
@@ -4,14 +4,13 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ttk_checkbutton.n,v 1.9 2007/10/30 21:29:59 dkf Exp $
+'\" RCS: @(#) $Id: ttk_checkbutton.n,v 1.10 2007/11/01 10:59:42 dkf Exp $
 '\" 
 .so man.macros
-.TH ttk_checkbutton n 8.5 Tk "Tk Themed Widget"
+.TH ttk::checkbutton n 8.5 Tk "Tk Themed Widget"
 .BS
-.\" Use _ instead of :: as the name becomes a filename on install
 .SH NAME
-ttk_checkbutton \- On/off widget
+ttk::checkbutton \- On/off widget
 .SH SYNOPSIS
 \fBttk::checkbutton\fR \fIpathName \fR?\fIoptions\fR?
 .BE
@@ -65,6 +64,6 @@ or
 .QW indeterminate
 selection.)
 .SH "SEE ALSO"
-ttk_widget(n), ttk_radiobutton(n), checkbutton(n)
+ttk::widget(n), ttk::radiobutton(n), checkbutton(n)
 .SH "KEYWORDS"
 widget, button, toggle, check, option
diff --git a/doc/ttk_combobox.n b/doc/ttk_combobox.n
index a027b50..6dee90f 100644
--- a/doc/ttk_combobox.n
+++ b/doc/ttk_combobox.n
@@ -4,18 +4,16 @@
 '\" 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.9 2007/10/29 16:04:14 dkf Exp $
+'\" RCS: @(#) $Id: ttk_combobox.n,v 1.10 2007/11/01 10:59:42 dkf Exp $
 '\"
 .so man.macros
-.TH ttk_combobox n 8.5 Tk "Tk Themed Widget"
+.TH ttk::combobox n 8.5 Tk "Tk Themed Widget"
 .BS
-.\" Use _ instead of :: as the name becomes a filename on install
 .SH NAME
-ttk_combobox \- text field with popdown selection list
+ttk::combobox \- text field with popdown selection list
 .SH SYNOPSIS
 \fBttk::combobox\fR \fIpathName \fR?\fIoptions\fR?
 .BE
-
 .SH DESCRIPTION
 A \fBttk::combobox\fR combines a text field with a pop-down list of values;
 the user may select the value of the text field from among the 
@@ -24,7 +22,6 @@ values in the list.
 \-class	\-cursor	\-takefocus	\-style
 .SE
 .\" ALSO: Other entry widget options
-
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-exportselection exportSelection ExportSelection
 Boolean value.
@@ -57,16 +54,15 @@ Specifies the list of values to display in the drop-down listbox.
 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
 Returns the current value of the specified \fIoption\fR.
-See \fIttk_widget(n)\fR.
+See \fIttk::widget(n)\fR.
 .TP
 \fIpathName \fBconfigure\fR ?\fIoption\fR? ?\fIvalue option value ...\fR?
 Modify or query widget options.
-See \fIttk_widget(n)\fR.
+See \fIttk::widget(n)\fR.
 .TP
 \fIpathName \fBcurrent\fR ?\fInewIndex\fR?
 If \fInewIndex\fR is supplied, sets the combobox value 
@@ -83,30 +79,28 @@ or the empty string if the coordinates are outside the window.
 .TP
 \fIpathName \fBinstate \fIstateSpec\fR ?\fIscript\fR?
 Test the widget state.
-See \fIttk_widget(n)\fR.
+See \fIttk::widget(n)\fR.
 .TP
 \fIpathName \fBset\fR \fIvalue\fR
 Sets the value of the combobox to \fIvalue\fR.
 .TP
 \fIpathName \fBstate\fR ?\fIstateSpec\fR?
 Modify or query the widget state.
-See \fIttk_widget(n)\fR.
+See \fIttk::widget(n)\fR.
 .PP
 The combobox widget also supports the following \fIttk::entry\fR
-widget commands (see \fIttk_entry(n)\fR for details):
+widget commands (see \fIttk::entry(n)\fR for details):
 .DS
 .ta 5.5c 11c
 bbox	delete	icursor
 index	insert	selection
 xview
 .DE
-
 .SH "VIRTUAL EVENTS"
 The combobox widget generates a \fB<<ComboboxSelected>>\fR virtual event
 when the user selects an element from the list of values.
 This event is generated after the listbox is unposted.
-
 .SH "SEE ALSO"
-ttk_widget(n), ttk_entry(n)
+ttk::widget(n), ttk::entry(n)
 .SH KEYWORDS
 choice, entry, list box, text box, widget
diff --git a/doc/ttk_entry.n b/doc/ttk_entry.n
index dcf46fc..c697c65 100644
--- a/doc/ttk_entry.n
+++ b/doc/ttk_entry.n
@@ -7,18 +7,16 @@
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
 '\" SOURCE: entry.n, r1.12
-'\" RCS: @(#) $Id: ttk_entry.n,v 1.7 2007/10/29 16:04:14 dkf Exp $
+'\" RCS: @(#) $Id: ttk_entry.n,v 1.8 2007/11/01 10:59:43 dkf Exp $
 '\" 
 .so man.macros
-.TH ttk_entry n 8.5 Tk "Tk Themed Widget"
+.TH ttk::entry n 8.5 Tk "Tk Themed Widget"
 .BS
-.\" Use _ instead of :: as the name becomes a filename on install
 .SH NAME
-ttk_entry \- Editable text field widget
+ttk::entry \- Editable text field widget
 .SH SYNOPSIS
 \fBttk::entry\fR \fIpathName \fR?\fIoptions\fR?
 .BE
-
 .SH DESCRIPTION
 .PP
 An \fBttk::entry\fR widget displays a one-line text string and
@@ -31,7 +29,6 @@ standard \fB\-xscrollcommand\fR option and \fBxview\fR widget command.
 \-class	\-cursor	\-style	\-takefocus
 \-xscrollcommand
 .SE
-
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-exportselection exportSelection ExportSelection
 A boolean value specifying whether or not 
@@ -66,7 +63,7 @@ If characters in the entry are selected and copied elsewhere, the
 information copied will be what is displayed, not the true contents
 of the entry.
 .OP \-state state State
-Compatibility option; see \fIttk_widget(n)\fR for details.
+Compatibility option; see \fIttk::widget(n)\fR for details.
 Specifies one of three states for the entry,
 \fBnormal\fR, \fBdisabled\fR, or \fBreadonly\fR.
 See \fBWIDGET STATES\fR, below.
@@ -91,7 +88,6 @@ 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
@@ -109,7 +105,6 @@ may be used to change the view in the window.  Entries use
 the standard \fBxScrollCommand\fR mechanism for interacting with
 scrollbars (see the description of the \fBxScrollCommand\fR option
 for details).
-
 .SH "INDICES"
 Many of the \fBentry\fR widget commands take one or more indices as
 arguments.  An index specifies a particular character in the entry's
@@ -160,11 +155,11 @@ of the window.
 .TP
 \fIpathName \fBcget\fR \fIoption\fR
 Returns the current value of the specified \fIoption\fR.
-See \fIttk_widget(n)\fR.
+See \fIttk::widget(n)\fR.
 .TP
 \fIpathName \fBconfigure\fR ?\fIoption\fR? ?\fIvalue option value ...\fR?
 Modify or query widget options.
-See \fIttk_widget(n)\fR.
+See \fIttk::widget(n)\fR.
 .TP
 \fIpathName \fBdelete \fIfirst \fR?\fIlast\fR?
 Delete one or more elements of the entry.
@@ -195,7 +190,7 @@ indicated by \fIindex\fR.  Returns the empty string.
 .TP
 \fIpathName \fBinstate \fIstatespec\fR ?\fIscript\fR?
 Test the widget state.
-See \fIttk_widget(n)\fR.
+See \fIttk::widget(n)\fR.
 .TP
 \fIpathName \fBselection \fIoption arg\fR
 This command is used to adjust the selection within an entry.  It
@@ -221,7 +216,7 @@ earlier one, then the entry's selection is cleared.
 .TP
 \fIpathName \fBstate\fR ?\fIstateSpec\fR?
 Modify or query the widget state.
-See \fIttk_widget(n)\fR.
+See \fIttk::widget(n)\fR.
 .TP
 \fIpathName \fBvalidate\fR
 Force revalidation, independent of the conditions specified 
@@ -267,7 +262,6 @@ If \fInumber\fR is negative then characters farther to the left
 become visible;  if it is positive then characters farther to the right
 become visible.
 .RE
-
 .SH VALIDATION
 The \fB\-validate\fR, \fB\-validatecommand\fR, and \fB\-invalidcommand\fR
 options are used to enable entry widget validation.
@@ -350,7 +344,6 @@ modifying the entry value in a validation script).
 .IP \(bu
 The standard entry widget invokes validation whenever the linked
 \fB\-textvariable\fR is modified; the Tk themed entry widget does not.
-
 .SH "DEFAULT BINDINGS"
 The entry widget's default bindings enable the following behavior.  
 In the descriptions below,
@@ -432,7 +425,6 @@ Control-d deletes the character to the right of the insert cursor.
 .IP \(bu
 Control-k deletes all the characters to the right of the insertion
 cursor.
-
 .SH "WIDGET STATES"
 In the \fBdisabled\fR state, 
 the entry cannot be edited and the text cannot be selected.
@@ -454,6 +446,6 @@ and a different background is used in the \fBreadonly\fR state.
 The entry widget sets the \fBinvalid\fR state if revalidation fails,
 and clears it whenever validation succeeds.
 .SH "SEE ALSO"
-ttk_widget(n), entry(n)
+ttk::widget(n), entry(n)
 .SH KEYWORDS
 entry, widget, text field
diff --git a/doc/ttk_frame.n b/doc/ttk_frame.n
index 3b50079..814bd44 100644
--- a/doc/ttk_frame.n
+++ b/doc/ttk_frame.n
@@ -4,14 +4,13 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ttk_frame.n,v 1.6 2007/10/29 16:04:14 dkf Exp $
+'\" RCS: @(#) $Id: ttk_frame.n,v 1.7 2007/11/01 10:59:43 dkf Exp $
 '\" 
 .so man.macros
-.TH ttk_frame n 8.5 Tk "Tk Themed Widget"
+.TH ttk::frame n 8.5 Tk "Tk Themed Widget"
 .BS
-.\" Use _ instead of :: as the name becomes a filename on install
 .SH NAME
-ttk_frame \- Simple container widget
+ttk::frame \- Simple container widget
 .SH SYNOPSIS
 \fBttk::frame\fR \fIpathName \fR?\fIoptions\fR?
 .BE
@@ -38,7 +37,7 @@ If specified, the widget's requested height in pixels.
 .SH "WIDGET COMMAND"
 Supports the standard widget commands
 \fBconfigure\fR, \fBcget\fR, \fBinstate\fR, and \fBstate\fR;
-see \fIttk_widget(n)\fR.
+see \fIttk::widget(n)\fR.
 .SH "NOTES"
 Note that if the \fBpack\fR, \fBgrid\fR, or other geometry managers
 are used to manage the children of the \fBframe\fR,
@@ -47,6 +46,6 @@ over the \fBframe\fR widget's \fB\-width\fR and \fB\-height\fR options.
 \fBpack propagate\fR and \fBgrid propagate\fR can be used
 to change this.
 .SH "SEE ALSO"
-ttk_widget(n), ttk_labelframe(n), frame(n)
+ttk::widget(n), ttk::labelframe(n), frame(n)
 .SH "KEYWORDS"
 widget, frame, container
diff --git a/doc/ttk_image.n b/doc/ttk_image.n
index c4f0d51..4f70656 100644
--- a/doc/ttk_image.n
+++ b/doc/ttk_image.n
@@ -4,13 +4,13 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ttk_image.n,v 1.10 2007/10/29 16:04:14 dkf Exp $
+'\" RCS: @(#) $Id: ttk_image.n,v 1.11 2007/11/01 10:59:43 dkf Exp $
 '\" 
 .so man.macros
-.TH ttk_image n 8.5 Tk "Tk Themed Widget"
+.TH ttk::image n 8.5 Tk "Tk Themed Widget"
 .BS
 .SH NAME
-ttk_image \- Define an element based on an image
+ttk::image \- Define an element based on an image
 .SH SYNOPSIS
 \fBttk::style element create \fIname\fR \fBimage\fR \fIimageSpec\fR ?\fIoptions\fR?
 .BE
diff --git a/doc/ttk_intro.n b/doc/ttk_intro.n
index 958c08b..fef7428 100644
--- a/doc/ttk_intro.n
+++ b/doc/ttk_intro.n
@@ -4,15 +4,14 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ttk_intro.n,v 1.7 2007/10/29 16:04:14 dkf Exp $
+'\" RCS: @(#) $Id: ttk_intro.n,v 1.8 2007/11/01 10:59:43 dkf Exp $
 '\" 
 .so man.macros
-.TH ttk_intro n 8.5 Tk "Tk Themed Widget"
+.TH ttk::intro n 8.5 Tk "Tk Themed Widget"
 .BS
 .SH NAME
-ttk_intro \- Introduction to the Tk theme engine
+ttk::intro \- Introduction to the Tk theme engine
 .BE
-
 .SH "OVERVIEW"
 The Tk themed widget set is based on a revised and enhanced version
 of TIP #48 (http://tip.tcl.tk/48) specified style engine.
@@ -23,7 +22,6 @@ the code implementing its appearance.
 Widget class bindings are primarily responsible for
 maintaining the widget state and invoking callbacks;
 all aspects of the widgets appearance is
-
 .SH "THEMES"
 A \fItheme\fR is a collection of elements and styles 
 that determine the look and feel of the widget set.
@@ -41,7 +39,6 @@ Application suite
 Blend in with the rest of the desktop (Gnome, KDE, Java)
 .IP \(bu
 And, of course: eye candy.
-
 .SH "ELEMENTS"
 An \fIelement\fR displays an individual part of a widget.
 For example, a vertical scrollbar widget contains \fBuparrow\fR,
@@ -93,7 +90,6 @@ style layout Horizontal.TScrollbar {
 By default, the layout for a widget is the same as its class name.
 Some widgets may override this (for example, the \fBscrollbar\fR
 widget chooses different layouts based on the \fB\-orient\fR option).
-
 .SH "STATES"
 In standard Tk, many widgets have a \fB\-state\fR option
 which (in most cases) is either \fBnormal\fR or \fBdisabled\fR.
@@ -105,7 +101,7 @@ The themed Tk widgets generalizes this idea:
 every widget has a bitmap of independent state flags.
 Widget state flags include \fBactive\fR, \fBdisabled\fR,
 \fBpressed\fR, \fBfocus\fR, etc., 
-(see \fIttk_widget(n)\fR for the full list of state flags).
+(see \fIttk::widget(n)\fR for the full list of state flags).
 .PP
 Instead of a \fB\-state\fR option, every widget now has 
 a \fBstate\fR widget command which is used to set or query
@@ -139,7 +135,6 @@ in the \fBpressed\fR state.
 but not by much).
 .PP
 \fINote to self: rewrite that paragraph.  It's horrible.\fR
-
 .SH "STYLES"
 Each widget is associated with a \fIstyle\fR, 
 which specifies values for element resources.
@@ -165,6 +160,5 @@ style map TButton \e
 	\-relief [list {pressed !disabled} sunken] \e
 	;
 .CE
-
 .SH "SEE ALSO"
-ttk_widget(n), ttk_style(n)
+ttk::widget(n), ttk::style(n)
diff --git a/doc/ttk_label.n b/doc/ttk_label.n
index cb48f4d..119de30 100644
--- a/doc/ttk_label.n
+++ b/doc/ttk_label.n
@@ -4,18 +4,16 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ttk_label.n,v 1.6 2007/10/29 16:04:14 dkf Exp $
+'\" RCS: @(#) $Id: ttk_label.n,v 1.7 2007/11/01 10:59:43 dkf Exp $
 '\" 
 .so man.macros
-.TH ttk_label n 8.5 Tk "Tk Themed Widget"
+.TH ttk::label n 8.5 Tk "Tk Themed Widget"
 .BS
-.\" Use _ instead of :: as the name becomes a filename on install
 .SH NAME
-ttk_label \- Display a text string and/or image
+ttk::label \- Display a text string and/or image
 .SH SYNOPSIS
 \fBttk::label\fR \fIpathName \fR?\fIoptions\fR?
 .BE
-
 .SH DESCRIPTION
 A \fBttk::label\fR widget displays a textual label and/or image.
 The label may be linked to a Tcl variable 
@@ -25,7 +23,6 @@ to automatically change the displayed text.
 \-style	\-takefocus	\-text	\-textvariable
 \-underline	\-width
 .SE
-
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-anchor anchor Anchor
 Specifies how the information in the widget is positioned
@@ -69,7 +66,6 @@ If this option is less than or equal to zero,
 then automatic wrapping is not performed; otherwise
 the text is split into lines such that no line is longer
 than the specified value.
-
 .SH "WIDGET COMMAND"
 .TP
 \fIpathName \fBcget\fR \fIoption\fR
@@ -79,7 +75,6 @@ than the specified value.
 \fIpathName \fBinstate \fIstateSpec\fR ?\fIscript\fR?
 .TP
 \fIpathName \fBstate\fR ?\fIstateSpec\fR?
-See \fIttk_widget(n)\fR
-
+See \fIttk::widget(n)\fR
 .SH "SEE ALSO"
-ttk_widget(n), label(n)
+ttk::widget(n), label(n)
diff --git a/doc/ttk_labelframe.n b/doc/ttk_labelframe.n
index 4401172..db1b62e 100644
--- a/doc/ttk_labelframe.n
+++ b/doc/ttk_labelframe.n
@@ -4,18 +4,16 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ttk_labelframe.n,v 1.6 2007/10/29 16:04:14 dkf Exp $
+'\" RCS: @(#) $Id: ttk_labelframe.n,v 1.7 2007/11/01 10:59:43 dkf Exp $
 '\" 
 .so man.macros
-.TH ttk_labelframe n 8.5 Tk "Tk Themed Widget"
+.TH ttk::labelframe n 8.5 Tk "Tk Themed Widget"
 .BS
-.\" Use _ instead of :: as the name becomes a filename on install
 .SH NAME
-ttk_labelframe \- Container widget with optional label
+ttk::labelframe \- Container widget with optional label
 .SH SYNOPSIS
 \fBttk::labelframe\fR \fIpathName \fR?\fIoptions\fR?
 .BE
-
 .SH DESCRIPTION
 A \fBttk::labelframe\fR widget is a container used to group other widgets
 together.  It has an optional label, which may be a plain text string or
@@ -23,7 +21,6 @@ another widget.
 .SO
 \-class	\-cursor	\-takefocus	\-style
 .SE
-
 .SH "WIDGET-SPECIFIC OPTIONS"
 .\" XXX: Currently included, but may go away: 
 .\" XXX: .OP -borderwidth borderWidth BorderWidth
@@ -63,16 +60,13 @@ same top-level widget as the \fBlabelframe\fR.
 If specified, the widget's requested width in pixels.
 .OP \-height height Height
 If specified, the widget's requested height in pixels.
-(See \fIttk_frame(n)\fR for further notes on \fB\-width\fR and
+(See \fIttk::frame(n)\fR for further notes on \fB\-width\fR and
 \fB\-height\fR).
-
 .SH "WIDGET COMMAND"
 Supports the standard widget commands
 \fBconfigure\fR, \fBcget\fR, \fBinstate\fR, and \fBstate\fR;
-see \fIttk_widget(n)\fR.
-
+see \fIttk::widget(n)\fR.
 .SH "SEE ALSO"
-ttk_widget(n), ttk_frame(n), labelframe(n)
-
+ttk::widget(n), ttk::frame(n), labelframe(n)
 .SH "KEYWORDS"
 widget, frame, container, label, groupbox
diff --git a/doc/ttk_menubutton.n b/doc/ttk_menubutton.n
index 15b8f95..54306bc 100644
--- a/doc/ttk_menubutton.n
+++ b/doc/ttk_menubutton.n
@@ -4,14 +4,13 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ttk_menubutton.n,v 1.6 2007/10/30 21:29:59 dkf Exp $
+'\" RCS: @(#) $Id: ttk_menubutton.n,v 1.7 2007/11/01 10:59:43 dkf Exp $
 '\" 
 .so man.macros
-.TH ttk_menubutton n 8.5 Tk "Tk Themed Widget"
+.TH ttk::menubutton n 8.5 Tk "Tk Themed Widget"
 .BS
-.\" Use _ instead of :: as the name becomes a filename on install
 .SH NAME
-ttk_menubutton \- Widget that pops down a menu when pressed
+ttk::menubutton \- Widget that pops down a menu when pressed
 .SH SYNOPSIS
 \fBttk::menubutton\fR \fIpathName \fR?\fIoptions\fR?
 .BE
@@ -42,6 +41,6 @@ Menubutton widgets support the standard
 \fBcget\fR, \fBconfigure\fR, \fBinstate\fR, and \fBstate\fR 
 methods.  No other widget methods are used.
 .SH "SEE ALSO"
-ttk_widget(n), menu(n), menubutton(n)
+ttk::widget(n), menu(n), menubutton(n)
 .SH "KEYWORDS"
 widget, button, menu
diff --git a/doc/ttk_notebook.n b/doc/ttk_notebook.n
index 58c2332..edef6ac 100644
--- a/doc/ttk_notebook.n
+++ b/doc/ttk_notebook.n
@@ -4,14 +4,13 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ttk_notebook.n,v 1.7 2007/10/30 21:29:59 dkf Exp $
+'\" RCS: @(#) $Id: ttk_notebook.n,v 1.8 2007/11/01 10:59:43 dkf Exp $
 '\" 
 .so man.macros
-.TH ttk_notebook n 8.5 Tk "Tk Themed Widget"
+.TH ttk::notebook n 8.5 Tk "Tk Themed Widget"
 .BS
-.\" Use _ instead of :: as the name becomes a filename on install
 .SH NAME
-ttk_notebook \- Multi-paned container widget
+ttk::notebook \- Multi-paned container widget
 .SH SYNOPSIS
 .nf
 \fBttk::notebook\fR \fIpathName \fR?\fIoptions\fR?
@@ -89,10 +88,10 @@ will be displayed.
 See \fBTAB OPTIONS\fR for the list of available \fIoptions\fR.
 .TP
 \fIpathname \fBconfigure\fR ?\fIoptions\fR?
-See \fIttk_widget(n)\fR.
+See \fIttk::widget(n)\fR.
 .TP
 \fIpathname \fBcget\fR \fIoption\fR
-See \fIttk_widget(n)\fR.
+See \fIttk::widget(n)\fR.
 .TP
 \fIpathname \fBforget\fR \fItabid\fR
 Removes the tab specified by \fItabid\fR,
@@ -112,7 +111,7 @@ moves it to the specified position.
 See \fBTAB OPTIONS\fR for the list of available options.
 .TP
 \fIpathname \fBinstate\fR \fIstatespec \fR?\fIscript...\fR?
-See \fIttk_widget(n)\fR.
+See \fIttk::widget(n)\fR.
 .TP
 \fIpathname \fBselect\fR ?\fItabid\fR?
 Selects the specified tab.  The associated child pane will be displayed,
@@ -121,7 +120,7 @@ If \fItabid\fR is omitted, returns the widget name of the
 currently selected pane.
 .TP
 \fIpathname \fBstate\fR ?\fIstatespec\fR?
-See \fIttk_widget(n)\fR.
+See \fIttk::widget(n)\fR.
 .TP
 \fIpathname \fBtab\fR \fItabid\fR ?\fI\-options \fR?\fIvalue ...\fR
 Query or modify the options of the specific tab.
@@ -188,6 +187,6 @@ pack [\fBttk::notebook\fR .nb]
 ttk::notebook::enableTraversal .nb
 .CE
 .SH "SEE ALSO"
-ttk_widget(n), grid(n)
+ttk::widget(n), grid(n)
 .SH "KEYWORDS"
 pane, tab
diff --git a/doc/ttk_panedwindow.n b/doc/ttk_panedwindow.n
index 1e6793e..8e66c9b 100644
--- a/doc/ttk_panedwindow.n
+++ b/doc/ttk_panedwindow.n
@@ -4,14 +4,13 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ttk_panedwindow.n,v 1.11 2007/10/30 21:29:59 dkf Exp $
+'\" RCS: @(#) $Id: ttk_panedwindow.n,v 1.12 2007/11/01 10:59:43 dkf Exp $
 '\" 
 .so man.macros
-.TH ttk_panedwindow n 8.5 Tk "Tk Themed Widget"
+.TH ttk::panedwindow n 8.5 Tk "Tk Themed Widget"
 .BS
-.\" Use _ instead of :: as the name becomes a filename on install
 .SH NAME
-ttk_panedwindow \- Multi-pane container window
+ttk::panedwindow \- Multi-pane container window
 .SH SYNOPSIS
 .nf
 \fBttk::panedwindow\fR \fIpathName \fR?\fIoptions\fR?
@@ -50,7 +49,7 @@ When the paned window is resized, the extra space is added
 or subtracted to each pane proportionally to its \fB\-weight\fR.
 .SH "WIDGET COMMAND"
 Supports the standard \fBconfigure\fR, \fBcget\fR, \fBstate\fR, 
-and \fBinstate\fR commands; see \fIttk_widget(n)\fR for details.
+and \fBinstate\fR commands; see \fIttk::widget(n)\fR for details.
 Additional commands:
 .TP
 \fIpathname \fBadd\fR \fIsubwindow\fR \fIoptions...\fR
@@ -95,4 +94,4 @@ Returns the new position of sash number \fIindex\fR.
 Returns the index of the sash at point \fIx,y\fR,
 or the empty string if \fIx,y\fR is not over a sash.
 .SH "SEE ALSO"
-ttk_widget(n), ttk_notebook(n), panedwindow(n)
+ttk::widget(n), ttk::notebook(n), panedwindow(n)
diff --git a/doc/ttk_progressbar.n b/doc/ttk_progressbar.n
index 3e18c43..7919924 100644
--- a/doc/ttk_progressbar.n
+++ b/doc/ttk_progressbar.n
@@ -4,18 +4,16 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ttk_progressbar.n,v 1.7 2007/10/29 16:04:14 dkf Exp $
+'\" RCS: @(#) $Id: ttk_progressbar.n,v 1.8 2007/11/01 10:59:43 dkf Exp $
 '\" 
 .so man.macros
-.TH ttk_progressbar n 8.5 Tk "Tk Themed Widget"
+.TH ttk::progressbar n 8.5 Tk "Tk Themed Widget"
 .BS
-.\" Use _ instead of :: as the name becomes a filename on install
 .SH NAME
-ttk_progressbar \- Provide progress feedback
+ttk::progressbar \- Provide progress feedback
 .SH SYNOPSIS
 \fBttk::progressbar\fR \fIpathName \fR?\fIoptions\fR?
 .BE
-
 .SH DESCRIPTION
 A \fBttk::progressbar\fR widget shows the status of a long-running
 operation.  They can operate in two modes: \fIdeterminate\fR mode shows the
@@ -25,7 +23,6 @@ that something is happening.
 .SO
 \-class	\-cursor	\-takefocus	\-style
 .SE
-
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-orient orient Orient
 One of \fBhorizontal\fR or \fBvertical\fR.
@@ -57,17 +54,16 @@ whenever the \fB\-value\fR is greater than 0 and,
 in \fIdeterminate\fR mode, less than \fB\-maximum\fR.
 This option may be used by the current theme 
 to provide additional animation effects.
-
 .SH "WIDGET COMMAND"
 .TP
 \fIpathName \fBcget\fR \fIoption\fR
-Returns the current value of the specified \fIoption\fR; see \fIttk_widget(n)\fR.
+Returns the current value of the specified \fIoption\fR; see \fIttk::widget(n)\fR.
 .TP
 \fIpathName \fBconfigure\fR ?\fIoption\fR? ?\fIvalue option value ...\fR?
-Modify or query widget options; see \fIttk_widget(n)\fR.
+Modify or query widget options; see \fIttk::widget(n)\fR.
 .TP
 \fIpathName \fBinstate \fIstatespec\fR ?\fIscript\fR?
-Test the widget state; see \fIttk_widget(n)\fR.
+Test the widget state; see \fIttk::widget(n)\fR.
 .TP
 \fIpathName \fBstart\fR ?\fIinterval\fR?
 Begin autoincrement mode:
@@ -76,7 +72,7 @@ every \fIinterval\fR milliseconds.
 If omitted, \fIinterval\fR defaults to 50 milliseconds (20 steps/second).
 .TP
 \fIpathName \fBstate\fR ?\fIstateSpec\fR?
-Modify or query the widget state; see \fIttk_widget(n)\fR.
+Modify or query the widget state; see \fIttk::widget(n)\fR.
 .TP
 \fIpathName \fBstep\fR ?\fIamount\fR?
 Increments the \fB\-value\fR by \fIamount\fR.  
@@ -85,6 +81,5 @@ Increments the \fB\-value\fR by \fIamount\fR.
 \fIpathName \fBstop\fR
 Stop autoincrement mode:
 cancels any recurring timer event initiated by \fIpathName \fBstart\fR.
-
 .SH "SEE ALSO"
-ttk_widget(n)
+ttk::widget(n)
diff --git a/doc/ttk_radiobutton.n b/doc/ttk_radiobutton.n
index ee82390..40bec0f 100644
--- a/doc/ttk_radiobutton.n
+++ b/doc/ttk_radiobutton.n
@@ -4,14 +4,13 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ttk_radiobutton.n,v 1.8 2007/10/30 21:29:59 dkf Exp $
+'\" RCS: @(#) $Id: ttk_radiobutton.n,v 1.9 2007/11/01 10:59:43 dkf Exp $
 '\" 
 .so man.macros
-.TH ttk_radiobutton n 8.5 Tk "Tk Themed Widget"
+.TH ttk::radiobutton n 8.5 Tk "Tk Themed Widget"
 .BS
-.\" Use _ instead of :: as the name becomes a filename on install
 .SH NAME
-ttk_radiobutton \- Mutually exclusive option widget
+ttk::radiobutton \- Mutually exclusive option widget
 .SH SYNOPSIS
 \fBttk::radiobutton\fR \fIpathName \fR?\fIoptions\fR?
 .BE
@@ -61,6 +60,6 @@ or
 .QW indeterminate
 selection.)
 .SH "SEE ALSO"
-ttk_widget(n), ttk_checkbutton(n), radiobutton(n)
+ttk::widget(n), ttk::checkbutton(n), radiobutton(n)
 .SH "KEYWORDS"
 widget, button, option
diff --git a/doc/ttk_scrollbar.n b/doc/ttk_scrollbar.n
index 506ddec..f7a5ad1 100644
--- a/doc/ttk_scrollbar.n
+++ b/doc/ttk_scrollbar.n
@@ -6,14 +6,13 @@
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
 '\" SOURCE: tk/doc/scrollbar.n, r1.4
-'\" RCS: @(#) $Id: ttk_scrollbar.n,v 1.8 2007/10/30 21:29:59 dkf Exp $
+'\" RCS: @(#) $Id: ttk_scrollbar.n,v 1.9 2007/11/01 10:59:43 dkf Exp $
 '\" 
 .so man.macros
-.TH ttk_scrollbar n 8.5 Tk "Tk Themed Widget"
+.TH ttk::scrollbar n 8.5 Tk "Tk Themed Widget"
 .BS
-.\" Use _ instead of :: as the name becomes a filename on install
 .SH NAME
-ttk_scrollbar \- Control the viewport of a scrollable widget 
+ttk::scrollbar \- Control the viewport of a scrollable widget 
 .SH SYNOPSIS
 \fBttk::scrollbar\fR \fIpathName \fR?\fIoptions...\fR?
 .BE
@@ -51,17 +50,17 @@ Specifies the orientation of the scrollbar.
 .SH "WIDGET COMMAND"
 .TP
 \fIpathName \fBcget\fR \fIoption\fR
-Returns the current value of the specified \fIoption\fR; see \fIttk_widget(n)\fR.
+Returns the current value of the specified \fIoption\fR; see \fIttk::widget(n)\fR.
 .TP
 \fIpathName \fBconfigure\fR ?\fIoption\fR? ?\fIvalue option value ...\fR?
-Modify or query widget options; see \fIttk_widget(n)\fR.
+Modify or query widget options; see \fIttk::widget(n)\fR.
 .TP
 \fIpathName \fBget\fR
 Returns the scrollbar settings in the form of a list whose
 elements are the arguments to the most recent \fBset\fR widget command.
 .TP
 \fIpathName \fBinstate \fIstatespec\fR ?\fIscript\fR?
-Test the widget state; see \fIttk_widget(n)\fR.
+Test the widget state; see \fIttk::widget(n)\fR.
 .TP
 \fIpathName \fBset\fR \fIfirst last\fR
 This command is normally invoked by the scrollbar's associated widget 
@@ -70,7 +69,7 @@ Specifies the visible range to be displayed.
 \fIfirst\fR and \fIlast\fR are real fractions between 0 and 1.
 .TP
 \fIpathName \fBstate\fR ?\fIstateSpec\fR?
-Modify or query the widget state; see \fIttk_widget(n)\fR.
+Modify or query the widget state; see \fIttk::widget(n)\fR.
 .SH "INTERNAL COMMANDS"
 The following widget commands are used internally
 by the TScrollbar widget class bindings.
@@ -155,6 +154,6 @@ grid columnconfigure $f 0 \-weight 1
 grid rowconfigure $f 0 \-weight 1
 .CE
 .SH "SEE ALSO"
-ttk_widget(n), scrollbar(n)
+ttk::widget(n), scrollbar(n)
 .SH KEYWORDS
 scrollbar, widget
diff --git a/doc/ttk_separator.n b/doc/ttk_separator.n
index 33fe8c9..a26fc19 100644
--- a/doc/ttk_separator.n
+++ b/doc/ttk_separator.n
@@ -4,18 +4,16 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ttk_separator.n,v 1.5 2007/10/26 20:13:23 dgp Exp $
+'\" RCS: @(#) $Id: ttk_separator.n,v 1.6 2007/11/01 10:59:43 dkf Exp $
 '\" 
 .so man.macros
-.TH ttk_separator n 8.5 Tk "Tk Themed Widget"
+.TH ttk::separator n 8.5 Tk "Tk Themed Widget"
 .BS
-.\" Use _ instead of :: as the name becomes a filename on install
 .SH NAME
-ttk_separator \- Separator bar
+ttk::separator \- Separator bar
 .SH SYNOPSIS
 \fBttk::separator\fR \fIpathName \fR?\fIoptions\fR?
 .BE
-
 .SH DESCRIPTION
 A \fBttk::separator\fR widget displays a horizontal or vertical separator
 bar.
@@ -23,19 +21,15 @@ bar.
 \-class	\-cursor	\-state	\-style	
 \-takefocus
 .SE
-
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-orient orient Orient
 One of \fBhorizontal\fR or \fBvertical\fR.
 Specifies the orientation of the separator.
-
 .SH "WIDGET COMMAND"
 Separator widgets support the standard 
 \fBcget\fR, \fBconfigure\fR, \fBinstate\fR, and \fBstate\fR 
 methods.  No other widget methods are used.
-
 .SH "SEE ALSO"
-ttk_widget(n)
-
+ttk::widget(n)
 .SH "KEYWORDS"
 widget, separator
diff --git a/doc/ttk_sizegrip.n b/doc/ttk_sizegrip.n
index 0b4e371..578a405 100644
--- a/doc/ttk_sizegrip.n
+++ b/doc/ttk_sizegrip.n
@@ -4,14 +4,13 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\"
-'\" RCS: @(#) $Id: ttk_sizegrip.n,v 1.12 2007/10/30 21:29:59 dkf Exp $
+'\" RCS: @(#) $Id: ttk_sizegrip.n,v 1.13 2007/11/01 10:59:43 dkf Exp $
 '\"
 .so man.macros
-.TH ttk_sizegrip n 8.5 Tk "Tk Themed Widget"
+.TH ttk::sizegrip n 8.5 Tk "Tk Themed Widget"
 .BS
-.\" Use _ instead of :: as the name becomes a filename on install
 .SH NAME
-ttk_sizegrip \- Bottom-right corner resize widget
+ttk::sizegrip \- Bottom-right corner resize widget
 .SH SYNOPSIS
 \fBttk::sizegrip\fR \fIpathName \fR?\fIoptions\fR?
 .BE
@@ -33,12 +32,15 @@ size grip by default.
 Adding a \fBttk::sizegrip\fR there is harmless, since
 the built-in grip will just mask the widget.
 .SH EXAMPLES
+.PP
+Using pack:
 .CS
-# Using pack:
 pack [ttk::frame $top.statusbar] \-side bottom \-fill x
 pack [\fBttk::sizegrip\fR $top.statusbar.grip] \-side right \-anchor se
-
-# Using grid:
+.CE
+.PP
+Using grid:
+.CS
 grid [\fBttk::sizegrip\fR $top.statusbar.grip] \e
     \-row $lastRow \-column $lastColumn \-sticky se
 # ... optional: add vertical scrollbar in $lastColumn,
@@ -57,6 +59,6 @@ the sizegrip widget will not resize the window.
 .QW southeast
 resizing.
 .SH "SEE ALSO"
-ttk_widget(n)
+ttk::widget(n)
 .SH "KEYWORDS"
 widget, sizegrip, grow box
diff --git a/doc/ttk_style.n b/doc/ttk_style.n
index 7520410..b4a8a55 100644
--- a/doc/ttk_style.n
+++ b/doc/ttk_style.n
@@ -4,13 +4,13 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ttk_style.n,v 1.8 2007/10/30 21:29:59 dkf Exp $
+'\" RCS: @(#) $Id: ttk_style.n,v 1.9 2007/11/01 10:59:44 dkf Exp $
 '\" 
 .so man.macros
-.TH ttk_style n 8.5 Tk "Tk Themed Widget"
+.TH ttk::style n 8.5 Tk "Tk Themed Widget"
 .BS
 .SH NAME
-ttk_style \- Control overall look and feel of widgets
+ttk::style \- Control overall look and feel of widgets
 .SH SYNOPSIS
 \fBttk::style\fR \fIoption\fR ?\fIargs\fR?
 .BE
@@ -120,6 +120,6 @@ ttk::style layout Horizontal.TScrollbar {
 }
 .CE
 .SH "SEE ALSO"
-ttk_intro(n), ttk_widget(n), photo(n)
+ttk::intro(n), ttk::widget(n), photo(n)
 .SH KEYWORDS
 style, theme, appearance
diff --git a/doc/ttk_treeview.n b/doc/ttk_treeview.n
index ef3ad9f..f0b2c61 100644
--- a/doc/ttk_treeview.n
+++ b/doc/ttk_treeview.n
@@ -4,13 +4,12 @@
 '\" 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.11 2007/10/30 21:29:59 dkf Exp $
+'\" RCS: @(#) $Id: ttk_treeview.n,v 1.12 2007/11/01 10:59:44 dkf Exp $
 '\" 
 .so man.macros
-.TH ttk_treeview n 8.5 Tk "Tk Themed Widget"
-.\" Use _ instead of :: as the name becomes a filename on install
+.TH ttk::treeview n 8.5 Tk "Tk Themed Widget"
 .SH NAME
-ttk_treeview \- hierarchical multicolumn data display widget
+ttk::treeview \- hierarchical multicolumn data display widget
 .SH SYNOPSIS
 \fBttk::treeview\fR \fIpathname \fR?\fIoptions\fR?
 .BE
@@ -109,7 +108,7 @@ If the \fIitem\fR is not visible
 returns the empty list.
 .TP
 \fIpathname \fBcget\fR \fIoption\fR
-Returns the current value of the specified \fIoption\fR; see \fIttk_widget(n)\fR.
+Returns the current value of the specified \fIoption\fR; see \fIttk::widget(n)\fR.
 .TP
 \fIpathname \fBchildren\fR \fIitem\fR ?\fInewchildren\fR?
 If \fInewchildren\fR is not specified,
@@ -164,7 +163,7 @@ Use \fIpathname column #0\fR to configure the tree column.
 .RE
 .TP
 \fIpathname \fBconfigure\fR ?\fIoption\fR? ?\fIvalue option value ...\fR?
-Modify or query widget options; see \fIttk_widget(n)\fR.
+Modify or query widget options; see \fIttk::widget(n)\fR.
 .TP
 \fIpathname \fBdelete\fR \fIitemList\fR
 Deletes each of the items in \fIitemList\fR and all of their descendants.
@@ -252,7 +251,7 @@ See \fBITEM OPTIONS\fR for the list of available options.
 .RE
 .TP
 \fIpathname \fBinstate \fIstatespec\fR ?\fIscript\fR?
-Test the widget state; see \fIttk_widget(n)\fR.
+Test the widget state; see \fIttk::widget(n)\fR.
 .TP
 \fIpathname \fBitem\fR \fIitem\fR ?\fI\-option \fR?\fIvalue \-option value...\fR?
 Query or modify the options for the specified \fIitem\fR.
@@ -318,7 +317,7 @@ in item \fIitem\fR to the specified \fIvalue\fR.
 See also \fBCOLUMN IDENTIFIERS\fR.
 .TP
 \fIpathname \fBstate\fR ?\fIstateSpec\fR?
-Modify or query the widget state; see \fIttk_widget(n)\fR.
+Modify or query the widget state; see \fIttk::widget(n)\fR.
 .TP
 \fIpathName \fBtag \fIargs...\fR
 .RS
@@ -356,7 +355,7 @@ See \fBTAG OPTIONS\fR for the list of available options.
 Standard command for horizontal scrolling; see \fIwidget(n)\fR.
 .TP
 \fIpathName \fByview \fIargs\fR
-Standard command for vertical scrolling; see \fIttk_widget(n)\fR.
+Standard command for vertical scrolling; see \fIttk::widget(n)\fR.
 .SH "ITEM OPTIONS"
 The following item options may be specified for items
 in the \fBinsert\fR and \fBitem\fR widget commands.
@@ -395,7 +394,6 @@ Specifies the font to use when drawing text.
 Specifies the item image, in case the item's \fB\-image\fR option is empty.
 .PP
 \fI(@@@ TODO: sort out order of precedence for options)\fR
-
 .SH "COLUMN IDENTIFIERS"
 Column identifiers take any of the following forms:
 .IP \(bu
@@ -433,6 +431,5 @@ The \fBfocus\fR and \fBselection\fR widget commands can be used
 to determine the affected item or items.
 In Tk 8.5, the affected item is also passed as the \fB\-detail\fR field
 of the virtual event.
-
 .SH "SEE ALSO"
-ttk_widget(n), listbox(n), image(n), bind(n)
+ttk::widget(n), listbox(n), image(n), bind(n)
diff --git a/doc/ttk_widget.n b/doc/ttk_widget.n
index 33448f7..d2979b8 100644
--- a/doc/ttk_widget.n
+++ b/doc/ttk_widget.n
@@ -4,13 +4,13 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: ttk_widget.n,v 1.10 2007/10/30 21:29:59 dkf Exp $
+'\" RCS: @(#) $Id: ttk_widget.n,v 1.11 2007/11/01 10:59:44 dkf Exp $
 '\" 
 .so man.macros
-.TH ttk_widget n 8.5 Tk "Tk Themed Widget"
+.TH ttk::widget n 8.5 Tk "Tk Themed Widget"
 .BS
 .SH NAME
-ttk_widget \- Standard options and commands supported by Tk themed widgets
+ttk::widget \- Standard options and commands supported by Tk themed widgets
 .BE
 .SH DESCRIPTION
 This manual describes common widget options and commands.
@@ -241,6 +241,6 @@ $b instate {pressed !disabled} { .b invoke }
 $b state !disabled
 .CE
 .SH "SEE ALSO"
-ttk_intro(n), style(n)
+ttk::intro(n), style(n)
 .SH KEYWORDS
 state, configure, option
diff --git a/unix/installManPage b/unix/installManPage
index 93fd925..98cd899 100755
--- a/unix/installManPage
+++ b/unix/installManPage
@@ -27,6 +27,7 @@ test -z "$S" && S="$DIR/"
 #	n             ;# Read next line
 #	s/,//g        ;# Remove all commas ...
 #	s/\\\ //g     ;# .. and backslash-escaped spaces.
+#       s/::/_/g       ;# Convert '::' to '_'
 #	s/ \\\-.*//   ;# Delete from \- to the end of line
 #	p             ;# print the result
 #	q             ;# exit
@@ -43,6 +44,7 @@ NAMES=`sed -n '
 	n
 	s/,//g
 	s/\\\ //g
+	s/::/_/g
 	s/ \\\-.*//
 	p
 	q