merge trunk

3 files changed, 14 insertions, 3 deletions

diff --git a/doc/keysyms.n b/doc/keysyms.n
index bf81440..512c1a6 100644
--- a/doc/keysyms.n
+++ b/doc/keysyms.n
@@ -15,7 +15,9 @@ Tk recognizes many keysyms when specifying key bindings (e.g.,
 .QW "\fBbind\fR \fB. <Key-\fR\fIkeysym\fR\fB>\fR" ).
 The following list enumerates the
 keysyms that will be recognized by Tk.  Note that not all keysyms will
-be valid on all platforms.  For example, on Unix systems, the presence
+be valid on all platforms, and some keysyms are also available on
+platforms that have a different native name for that key.
+For example, on Unix systems, the presence
 of a particular keysym is dependant on the configuration of the
 keyboard modifier map.  This list shows keysyms along with their
 decimal and hexadecimal values.
@@ -918,6 +920,13 @@ Super_R                          65516     0xffec
 Hyper_L                          65517     0xffed
 Hyper_R                          65518     0xffee
 Delete                           65535     0xffff
+XF86AudioLowerVolume         269025041     0x1008FF11
+XF86AudioMute                269025042     0x1008FF12
+XF86AudioRaiseVolume         269025043     0x1008FF13
+XF86AudioPlay                269025044     0x1008FF14
+XF86AudioStop                269025045     0x1008FF15
+XF86AudioPrev                269025046     0x1008FF16
+XF86AudioNext                269025047     0x1008FF17
 .CE
 .SH "SEE ALSO"
 bind(n), event(n)
diff --git a/doc/ttk_notebook.n b/doc/ttk_notebook.n
index 4d1b789..290a0c7 100644
--- a/doc/ttk_notebook.n
+++ b/doc/ttk_notebook.n
@@ -171,7 +171,8 @@ Otherwise, sets the \fI\-option\fRs to the corresponding \fIvalue\fRs.
 See \fBTAB OPTIONS\fR for the available options.
 .TP
 \fIpathname \fBtabs\fR
-Returns the list of windows managed by the notebook.
+Returns the list of windows managed by the notebook, in the index order of
+their associated tabs.
 .SH "KEYBOARD TRAVERSAL"
 To enable keyboard traversal for a toplevel window
 containing a notebook widget \fI$nb\fR, call:
diff --git a/doc/ttk_panedwindow.n b/doc/ttk_panedwindow.n
index 29fca1d..4ba42bc 100644
--- a/doc/ttk_panedwindow.n
+++ b/doc/ttk_panedwindow.n
@@ -91,7 +91,8 @@ If one \fI\-option\fR is specified, returns the value of that \fIoption\fR.
 Otherwise, sets the \fI\-option\fRs to the corresponding \fIvalue\fRs.
 .TP
 \fIpathname \fBpanes\fR
-Returns the list of all windows managed by the widget.
+Returns the list of all windows managed by the widget, in the index order of
+their associated panes.
 .TP
 \fIpathname \fBsashpos \fIindex\fR ?\fInewpos\fR?
 If \fInewpos\fR is specified, sets the position