Merge 8.7

2 files changed, 14 insertions, 6 deletions

diff --git a/doc/SetOptions.3 b/doc/SetOptions.3
index 3967b36..2e877af 100644
--- a/doc/SetOptions.3
+++ b/doc/SetOptions.3
@@ -419,6 +419,15 @@ specify octal or hexadecimal numbers, respectively).  The internal
 form is a C \fBint\fR value.  This option type supports the \fBTK_OPTION_NULL_OK\fR
 flag; if a NULL value is set, the internal representation is set to INT_MIN.
 .TP
+\fBTK_OPTION_INDEX\fR
+The string value must be an index in the format accepted by \fBTcl_GetIntForIndex()\fR
+or the empty string.  The internal form is a C \fBint\fR value. If the string
+starts with \fB-\fR, the internal representation will be set to INT_MIN. If the
+string has the form \fBend-???\fR, then the result will be a negative number:
+\fB-1\fR stands for \fBend\fR, \fB-2\fR stands for \fBend-1\fR and so on.
+This option type supports the \fBTK_OPTION_NULL_OK\fR flag;
+if a NULL value is set, the internal representation is set to INT_MIN.
+.TP
 \fBTK_OPTION_JUSTIFY\fR
 The value must be a standard justification value such as \fBleft\fR.
 The internal form is a Tk_Justify like the values returned by
diff --git a/doc/menu.n b/doc/menu.n
index df8614b..42d1775 100644
--- a/doc/menu.n
+++ b/doc/menu.n
@@ -343,13 +343,12 @@ nothing to happen in the widget command.
 Same as \fB{}\fR
 This form may not be abbreviated.
 .TP 12
-\fB@\fInumber\fR
+\fB@\fIx\fB,\fIy\fR
 .
-In this form, \fInumber\fR is treated as a y-coordinate in the
-menu's window;  the entry closest to that y-coordinate is used.
-For example,
-.QW \fB@0\fR
-indicates the top-most entry in the window.
+Indicates the entry that covers the point in the menu's window specified
+by \fIx\fR and \fIy\fR (in pixel coordinates).
+If no entry covers that point, then this form is equivalent to \fB{}\fR.
+If only a single number is specified, it is treated as the y-coordinate.
 .TP 12
 \fInumber\fR
 .