Merge trunk

6 files changed, 34 insertions, 29 deletions

diff --git a/doc/bind.n b/doc/bind.n
index 009fd08..6e7f1f9 100644
--- a/doc/bind.n
+++ b/doc/bind.n
@@ -638,11 +638,11 @@ of events matched) is more specific than a shorter sequence;
 .IP (c)
 if the modifiers specified in one pattern are a subset of the
 modifiers in another pattern, then the pattern with more modifiers
-is more specific.
+is more specific;
 .IP (d)
 a virtual event whose physical pattern matches the sequence is less
 specific than the same physical pattern that is not associated with a
-virtual event.
+virtual event;
 .IP (e)
 given a sequence that matches two or more virtual events, one
 of the virtual events will be chosen, but the order is undefined.
diff --git a/doc/grid.n b/doc/grid.n
index ea72db1..7f1db95 100644
--- a/doc/grid.n
+++ b/doc/grid.n
@@ -177,7 +177,7 @@ If a slave's cell is larger than its requested dimensions, this
 option may be used to position (or stretch) the slave within its cell.
 \fIStyle\fR  is a string that contains zero or more of the characters
 \fBn\fR, \fBs\fR, \fBe\fR or \fBw\fR.
-The string can optionally contains spaces or
+The string can optionally contain spaces or
 commas, but they are ignored.  Each letter refers to a side (north, south,
 east, or west) that the slave will
 .QW stick
diff --git a/doc/menu.n b/doc/menu.n
index bd6f0be..c6fcec3 100644
--- a/doc/menu.n
+++ b/doc/menu.n
@@ -470,18 +470,19 @@ a menu entry does not automatically unpost the menu;  the default
 bindings normally take care of this before invoking the \fBinvoke\fR
 widget command.
 .TP
-\fIpathName \fBpost \fIx y\fR
+\fIpathName \fBpost \fIx y\fR ?\fIindex\fR?
 .
 Arrange for the menu to be displayed on the screen at the root-window
-coordinates given by \fIx\fR and \fIy\fR.  These coordinates are
-adjusted if necessary to guarantee that the entire menu is visible on
-the screen.  This command normally returns an empty string.
-If the \fB\-postcommand\fR option has been specified, then its value is
-executed as a Tcl script before posting the menu and the result of
-that script is returned as the result of the \fBpost\fR widget
-command.
-If an error returns while executing the command, then the error is
-returned without posting the menu.
+coordinates given by \fIx\fR and \fIy\fR.  If an index is specified
+the menu will be located so that the entry with that index is
+displayed at the point.  These coordinates are adjusted if necessary to
+guarantee that the entire menu is visible on the screen.  This command
+normally returns an empty string.  If the \fB\-postcommand\fR option
+has been specified, then its value is executed as a Tcl script before
+posting the menu and the result of that script is returned as the
+result of the \fBpost\fR widget command.  If an error returns while
+executing the command, then the error is returned without posting the
+menu.
 .TP
 \fIpathName \fBpostcascade \fIindex\fR
 .
diff --git a/doc/scale.n b/doc/scale.n
index 6b960ce..d6407a0 100644
--- a/doc/scale.n
+++ b/doc/scale.n
@@ -55,7 +55,7 @@ it is the scale's width.
 .OP \-resolution resolution Resolution
 A real value specifying the resolution for the scale.
 If this value is greater than zero then the scale's value will always be
-rounded to an even multiple of this value, as will tick marks and
+rounded to an even multiple of this value, as will
 the endpoints of the scale.  If the value is less than zero then no
 rounding occurs.  Defaults to 1 (i.e., the value will be integral).
 .OP \-showvalue showValue ShowValue
@@ -78,7 +78,7 @@ specified by the \fB\-activebackground\fR option.
 .OP \-tickinterval tickInterval TickInterval
 Must be a real value.
 Determines the spacing between numerical
-tick marks displayed below or to the left of the slider.
+tick marks displayed below or to the left of the slider. The values will all be displayed with the same number of decimal places, which will be enough to ensure they are all accurate to within 20% of a tick interval.
 If 0, no tick marks will be displayed.
 .OP \-to to To
 Specifies a real value corresponding
diff --git a/doc/ttk_treeview.n b/doc/ttk_treeview.n
index b81bc62..96565a3 100644
--- a/doc/ttk_treeview.n
+++ b/doc/ttk_treeview.n
@@ -434,6 +434,9 @@ 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
+.PP
+Tag priority is decided by the creation order: tags created first receive
+higher priority.
 .SH "COLUMN IDENTIFIERS"
 .PP
 Column identifiers take any of the following forms:
diff --git a/doc/wm.n b/doc/wm.n
index 0e79306..aae68d9 100644
--- a/doc/wm.n
+++ b/doc/wm.n
@@ -710,20 +710,21 @@ specified then the command returns the current title for the
 .TP
 \fBwm transient \fIwindow\fR ?\fImaster\fR?
 .
-If \fImaster\fR is specified, then the window manager is informed
-that \fIwindow\fR is a transient window (e.g. pull-down menu) working
-on behalf of \fImaster\fR (where \fImaster\fR is the
-path name for a top-level window).  If \fImaster\fR
-is specified as an empty string then \fIwindow\fR is marked as not
-being a transient window any more.  Otherwise the command
-returns the path name of \fIwindow\fR's current master, or an
-empty string if \fIwindow\fR is not currently a transient window.
-A transient window will mirror state changes in the master and
-inherit the state of the master when initially mapped. It is an
-error to attempt to make a window a transient of itself.
-The window manager may also decorate a transient window differently, removing
-some features normally present (e.g., minimize and maximize buttons) though
-this is entirely at the discretion of the window manager.
+If \fImaster\fR is specified, then the window manager is informed that
+\fIwindow\fR is a transient window (e.g. pull-down menu) working on
+behalf of \fImaster\fR (where \fImaster\fR is the path name for a
+top-level window).  If \fImaster\fR is specified as an empty string
+then \fIwindow\fR is marked as not being a transient window any more.
+Otherwise the command returns the path name of \fIwindow\fR's current
+master, or an empty string if \fIwindow\fR is not currently a
+transient window.  A transient window will mirror state changes in the
+master and inherit the state of the master when initially mapped. The
+directed graph with an edge from each transient to its master must be
+acyclic.  In particular, it is an error to attempt to make a window a
+transient of itself.  The window manager may also decorate a transient
+window differently, removing some features normally present (e.g.,
+minimize and maximize buttons) though this is entirely at the
+discretion of the window manager.
 .TP
 \fBwm withdraw \fIwindow\fR
 .