merge 8.5

3 files changed, 4 insertions, 5 deletions

diff --git a/doc/event.n b/doc/event.n
index 0a5ced5..85033e9 100644
--- a/doc/event.n
+++ b/doc/event.n
@@ -424,7 +424,7 @@ the physical event.
 .PP
 Bindings on a virtual event may be created before the virtual event exists.
 Indeed, the virtual event never actually needs to be defined, for instance,
-on platforms where the specific virtual event would meaningless or
+on platforms where the specific virtual event would be meaningless or
 ungeneratable.
 .PP
 When a definition of a virtual event changes at run time, all windows
diff --git a/doc/listbox.n b/doc/listbox.n
index b2e8e38..642e1f0 100644
--- a/doc/listbox.n
+++ b/doc/listbox.n
@@ -414,7 +414,7 @@ In \fBbrowse\fR mode it is also possible to drag the selection
 with button 1.
 .VS 8.5
 On button 1, the listbox will also take focus if it has a \fBnormal\fR
-state and \fB\-takefocus\fR is true.
+state.
 .VE 8.5
 .PP
 If the selection mode is \fBmultiple\fR or \fBextended\fR,
diff --git a/doc/text.n b/doc/text.n
index 3633703..d2f0c82 100644
--- a/doc/text.n
+++ b/doc/text.n
@@ -2222,9 +2222,8 @@ after copying it to the clipboard.
 Control-t reverses the order of the two characters to the right of
 the insertion cursor.
 .IP [32]
-Control-z (and Control-underscore on UNIX when \fBtk_strictMotif\fR is
-true) undoes the last edit action if the \fB\-undo\fR option is true.
-Does nothing otherwise.
+Control-z (undoes the last edit action if the \fB\-undo\fR option is
+true. Does nothing otherwise.
 .IP [33]
 Control-Z (or Control-y on Windows) reapplies the last undone edit
 action if the \fB\-undo\fR option is true. Does nothing otherwise.