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

1 files changed, 31 insertions, 19 deletions

diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index 6bf6850ccf..85115fc22b 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -22,8 +22,7 @@ is not located in the default place.  You can jump to subjects like with tags:
 Use CTRL-] to jump to a subject under the cursor, use CTRL-T to jump back.
 
 							*pronounce*
-Vim is pronounced as one word, like Jim.  So Nvim is N-Jim, which sounds like
-"Ninja".  Starting Nvim is like performing a roundhouse kick.
+Vim is pronounced as one word, like Jim.  So Nvim is "En-Vim", two syllables.
 
 This manual is a reference for all Nvim editor and API features.  It is not an
 introduction; instead for beginners, there is a hands-on |tutor| and a user
@@ -83,14 +82,14 @@ For the most recent information about sponsoring look on the Vim web site:
 	https://www.vim.org/sponsor/
 
 
-Neovim development is funded separately from Vim:
+Nvim development is funded separately from Vim:
 
 	https://neovim.io/#sponsor
 
 ==============================================================================
-Credits				*credits*
+Credits							*credits*
 
-Most of Vim was written by Bram Moolenaar <Bram@vim.org>.
+Most of Vim was written by Bram Moolenaar <Bram@vim.org> |Bram-Moolenaar|.
 
 Parts of the documentation come from several Vi manuals, written by:
 	W.N. Joy
@@ -121,7 +120,7 @@ Vim would never have become what it is now, without the help of these people!
 	Eric Fischer		Mac port, 'cindent', and other improvements
 	Benji Fisher		Answering lots of user questions
 	Bill Foster		Athena GUI port (later removed)
-	Google			Lets me work on Vim one day a week
+	Google			Let Bram work on Vim one day a week
 	Loic Grenie		xvim (ideas for multi windows version)
 	Sven Guckes		Vim promoter and previous WWW page maintainer
 	Darren Hiebert		Exuberant ctags
@@ -194,6 +193,19 @@ Elvis	Another Vi clone, made by Steve Kirkendall.  Very compact but isn't
 Vim	Nvim is based on Vim.  https://www.vim.org/
 
 ==============================================================================
+Bram Moolenaar			*Bram* *Moolenaar* *Bram-Moolenaar* *brammool*
+
+Nvim is a fork of the Vim ("Vi IMproved") text editor, which was originally
+developed by Bram Moolenaar.  Searching his name within the source code of
+Nvim will reveal just how much of his work still remains in Nvim.
+On August 3, 2023, he passed away at the age of 62.  If Vim or Nvim have been
+of use to you in your life, please read |Uganda| and consider honoring his
+memory however you may see fit.
+
+Obituary Articles: https://github.com/vim/vim/discussions/12742
+Say Farewell: https://github.com/vim/vim/discussions/12737
+
+==============================================================================
 Notation						*notation*
 
 When syntax highlighting is used to read this, text that is not typed
@@ -358,7 +370,7 @@ notation	meaning		    equivalent	decimal value(s)	~
 <kOrigin>	keypad origin (middle)		*keypad-origin*
 <kPageUp>	keypad page-up (upper right)	*keypad-page-up*
 <kPageDown>	keypad page-down (lower right)	*keypad-page-down*
-<kDel>		keypad delete 			*keypad-delete*
+<kDel>		keypad delete			*keypad-delete*
 <kPlus>		keypad +			*keypad-plus*
 <kMinus>	keypad -			*keypad-minus*
 <kMultiply>	keypad *			*keypad-multiply*
@@ -372,6 +384,7 @@ notation	meaning		    equivalent	decimal value(s)	~
 <C-…>		control-key			*control* *ctrl* *<C-*
 <M-…>		alt-key or meta-key		*META* *ALT* *<M-*
 <A-…>		same as <M-…>			*<A-*
+<T-…>		meta-key when it's not alt	*<T-*
 <D-…>		command-key or "super" key	*<D-*
 ----------------------------------------------------------------------- ~
 
@@ -382,10 +395,10 @@ Note:
 - If numlock is on the |TUI| receives plain ASCII values, so mapping <k0>,
   <k1>, ..., <k9> and <kPoint> will not work.
 - Nvim supports mapping multibyte chars with modifiers such as `<M-ä>`. Which
-  combinations actually work depends on the the UI or host terminal.
+  combinations actually work depends on the UI or host terminal.
 - When a key is pressed using a meta or alt modifier and no mapping exists for
   that keypress, Nvim may behave as though <Esc> was pressed before the key.
-- It is possible to notate combined modifiers (e.g. <C-A-T> for CTRL-ALT-T),
+- It is possible to notate combined modifiers (e.g. <M-C-T> for CTRL-ALT-T),
   but your terminal must encode the input for that to work. |tui-input|
 
 								*<>*
@@ -517,16 +530,15 @@ CTRL-O in Insert mode you get a beep but you are still in Insert mode, type
 <Esc> again.
 
 							*i_esc*
-		TO mode						    ~
-		Normal	Visual	Select	Insert	  Replace   Cmd-line  Ex ~
-FROM mode								 ~
-Normal			v V ^V	  `*4`	 *1	   R gR     : / ? !   Q
-Visual		 `*2`		  ^G	 c C	    --	      :       --
-Select		 `*5`	^O ^G		 `*6`	    --	      --      --
-Insert		 <Esc>	  --	  --		  <Insert>    --      --
-Replace		 <Esc>	  --	  --	<Insert>	      --      --
-Command-line	 `*3`	  --	  --	 :start	    --		      --
-Ex		 :vi	  --	  --	 --	    --	      --
+ FROM mode	TO mode						    ~
+		Normal	Visual	Select	Insert	  Replace   Cmd-line  Ex >
+ Normal			v V ^V	  *4	 *1	   R gR     : / ? !   Q
+ Visual		 *2		  ^G	 c C	    --	      :       --
+ Select		 *5	^O ^G		 *6	    --	      --      --
+ Insert		 <Esc>	  --	  --		  <Insert>    --      --
+ Replace	 <Esc>	  --	  --	<Insert>	      --      --
+ Command-line	 `*3`	  --	  --	 :start	    --		      --
+ Ex		 :vi	  --	  --	 --	    --	      --
 
 -- not possible