Merge remote-tracking branch 'upstream/master' into fix_repeatcmdline

1 files changed, 6 insertions, 7 deletions

diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt
index 1fce9fa491..bf62dba539 100644
--- a/runtime/doc/gui.txt
+++ b/runtime/doc/gui.txt
@@ -33,7 +33,7 @@ Example: this sets "g:gui" to the value of the UI's "rgb" field:    >
 		remembered until the window is opened.  The position is
 		adjusted to make the window fit on the screen (if possible).
 
-						    *:win* *:winsize* *E465*
+					    *:wi* *:win* *:winsize* *E465*
 :win[size] {width} {height}
 		Set the window height to {width} by {height} characters.
 		Obsolete, use ":set lines=11 columns=22".
@@ -466,12 +466,11 @@ If no argument is given after :menu at all, then ALL menu items are shown
 for the appropriate mode (e.g., Command-line mode for :cmenu).
 
 Special characters in the list, just before the rhs:
-*	The menu was defined with "nore" to disallow remapping.
-&	The menu was defined with "<script>" to allow remapping script-local
-	mappings only.
-s	The menu was defined with "<silent>" to avoid showing what it is
-	mapped to when triggered.
--	The menu was disabled.
+• * Menu was defined with "nore" to disallow remapping.
+• & Menu was defined with "<script>" to allow remapping script-local mappings.
+• s Menu was defined with "<silent>" to avoid showing what it is mapped to
+    when triggered.
+• - Menu was disabled.
 
 Note that hitting <Tab> while entering a menu name after a menu command may
 be used to complete the name of the menu item.