merge updates from HEAD

1 files changed, 25 insertions, 28 deletions

diff --git a/doc/ttk_button.n b/doc/ttk_button.n
index abb9056..2f357de 100644
--- a/doc/ttk_button.n
+++ b/doc/ttk_button.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_button.n,v 1.3.2.2 2007/10/27 04:23:14 dgp Exp $
+'\" RCS: @(#) $Id: ttk_button.n,v 1.3.2.3 2007/11/01 16:37:16 dgp 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
-
 .SH DESCRIPTION
 A \fBttk::button\fR widget displays a textual label and/or image,
 and evaluates a command when pressed.
@@ -24,36 +22,38 @@ and evaluates a command when pressed.
 \-state	\-style	\-takefocus	\-text	
 \-textvariable	\-underline	\-width
 .SE
-
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-command command Command
 A script to evaluate when the widget is invoked.
 .OP \-default default Default
 May be set to one of  \fBnormal\fR, \fBactive\fR, or \fBdisabled\fR.
-In a dialog box, one button may be designated the "default" button
-(meaning, roughly, "the one that gets invoked when the user presses <Enter>").
+In a dialog box, one button may be designated the
+.QW default
+button (meaning, roughly,
+.QW "the one that gets invoked when the user presses <Enter>" ).
 \fBactive\fR indicates that this is currently the default button;
 \fBnormal\fR means that it may become the default button, and
 \fBdisabled\fR means that it is not defaultable.
 The default is \fBnormal\fR.
-.br
+.RS
+.PP
 Depending on the theme, the default button may be displayed 
 with an extra highlight ring, or with a different border color.
+.RE
 .OP \-width width Width
 If greater than zero, specifies how much space, in character widths, 
 to allocate for the text label.  
 If less than zero, specifies a minimum width.
 If zero or unspecified, the natural width of the text label is used.
-Note that some themes may specify a non-zero \fB-width\fR
+Note that some themes may specify a non-zero \fB\-width\fR
 in the style.
-'\" Not documented -- may go away
-'\" .OP \-padding padding Padding
-'\" .OP \-foreground foreground Foreground
-'\" .OP \-font font Font
-'\" .OP \-anchor anchor Anchor
-'\" .OP \-padding padding Padding
-'\" .OP \-relief relief Relief
-
+.\" Not documented -- may go away
+.\" .OP \-padding padding Padding
+.\" .OP \-foreground foreground Foreground
+.\" .OP \-font font Font
+.\" .OP \-anchor anchor Anchor
+.\" .OP \-padding padding Padding
+.\" .OP \-relief relief Relief
 .SH "WIDGET COMMAND"
 .TP
 \fIpathName \fBinvoke\fR
@@ -66,18 +66,15 @@ 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 \fBdisabled\fR state bit.
-This is a ``write-only'' option: setting it changes the
-widget state, but the \fBstate\fR widget command does
-not affect the state option.
-
+May be set to \fBnormal\fR or \fBdisabled\fR to control the
+\fBdisabled\fR state bit. This is a
+.QW write-only
+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