doc/deprecated.txt (#5338)

`deprecated.txt` is a place for deprecated tags to live.
- Encourages aggressive documentation of deprecations without cluttering
  the main help files.
- Provides a single browsable reference of all deprecations.

Other changes:
- Move tags to doc/vim_diff.txt.
- Remove doc/quotes.txt. It has little historical value, except maybe the
  Larry Wall quote.

12 files changed, 79 insertions, 426 deletions

diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index dc37ff1d6d..76dd3c7d4c 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -256,7 +256,6 @@ Name			triggered by ~
 	Options
 |FileType|		when the 'filetype' option has been set
 |Syntax|		when the 'syntax' option has been set
-|EncodingChanged|	after the 'encoding' option has been changed
 |TermChanged|		after the value of 'term' has changed
 |OptionSet|		after setting any option
 
@@ -557,9 +556,6 @@ CursorMoved			After the cursor was moved in Normal or Visual
 CursorMovedI			After the cursor was moved in Insert mode.
 				Not triggered when the popup menu is visible.
 				Otherwise the same as CursorMoved.
-							*EncodingChanged*
-EncodingChanged			Fires off after the 'encoding' option has been
-				changed.  Useful to set up fonts, for example.
 							*FileAppendCmd*
 FileAppendCmd			Before appending to a file.  Should do the
 				appending to the file.  Use the '[ and ']
@@ -618,9 +614,6 @@ FileChangedShell		When Vim notices that the modification time of
 							*FileChangedShellPost*
 FileChangedShellPost		After handling a file that was changed outside
 				of Vim.  Can be used to update the statusline.
-							*FileEncoding*
-FileEncoding			Obsolete.  It still works and is equivalent
-				to |EncodingChanged|.
 							*FileReadCmd*
 FileReadCmd			Before reading a file with a ":read" command.
 				Should do the reading of the file. |Cmd-event|
diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
new file mode 100644
index 0000000000..b9b6fbf8a8
--- /dev/null
+++ b/runtime/doc/deprecated.txt
@@ -0,0 +1,43 @@
+*deprecated.txt*                                                        {Nvim}
+
+
+                             NVIM REFERENCE MANUAL
+
+
+Nvim                                                             *deprecated*
+
+==============================================================================
+
+Normal commands ~
+*]f*
+*[f*			Same as "gf".
+
+
+Commands ~
+*:rv*
+*:rviminfo*		Deprecated alias to |:rshada| command.
+*:wv*
+*:wviminfo*		Deprecated alias to |:wshada| command.
+
+
+Events ~
+*EncodingChanged*	Never fired; 'encoding' is always "utf-8".
+*FileEncoding*		Never fired; equivalent to |EncodingChanged|.
+
+Highlight groups ~
+*hl-VisualNOS*		Obsolete. |vim-differences| {Nvim}
+
+Functions ~
+*buffer_exists()*	Obsolete name for |bufexists()|.
+*buffer_name()*		Obsolete name for |bufname()|.
+*buffer_number()*	Obsolete name for |buffer_number()|.
+*file_readable()*	Obsolete name for |filereadable()|.
+*highlight_exists()*	Obsolete name for |hlexists()|.
+*highlightID()*		Obsolete name for |hlID()|.
+*last_buffer_nr()*	Obsolete name for bufnr("$").
+
+Options ~
+*'fe'*			'fenc'+'enc' before Vim 6.0; no longer used.
+*'vi'*
+*'viminfo'*		Deprecated alias to 'shada' option.
+
diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt
index ddec137079..b738da9bec 100644
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -213,13 +213,13 @@ If the function acts on an object then {thing} is the name of that object
 with a {thing} that groups functions under a common concept).
 
 Use existing common {action} names if possible:
-    add   append to, or insert into, a collection
-    get   get a thing (or subset of things by some query)
-    set   set a thing
-    del   delete a thing (or group of things)
-    list  get all things
+    add   Append to, or insert into, a collection
+    get   Get a thing (or subset of things by some query)
+    set   Set a thing
+    del   Delete a thing (or group of things)
+    list  Get all things
 
-Use consistent names for {thing} in all API function. E.g. a buffer is called
+Use consistent names for {thing} in all API functions. E.g. a buffer is called
 "buf" everywhere, not "buffer" in some places and "buf" in others.
 
 Example: `nvim_get_current_line` acts on the global editor state; the common
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index 6f85436ab4..8b6c14cc52 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -267,9 +267,6 @@ CTRL-^			Edit the alternate file.  Mostly the alternate file is
 			files.
 			See |CTRL-^| above for further details.
 
-[count]]f						*]f* *[f*
-[count][f		Same as "gf".  Deprecated.
-
 							*gf* *E446* *E447*
 [count]gf		Edit the file whose name is under or after the cursor.
 			Mnemonic: "goto file".
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index d97a1400ce..df5713c63d 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -2414,8 +2414,6 @@ bufexists({expr})					*bufexists()*
 		for MS-Windows 8.3 names in the form "c:\DOCUME~1"
 		Use "bufexists(0)" to test for the existence of an alternate
 		file name.
-							*buffer_exists()*
-		Obsolete name: buffer_exists().
 
 buflisted({expr})					*buflisted()*
 		The result is a Number, which is non-zero if a buffer called
@@ -2454,8 +2452,6 @@ bufname({expr})						*bufname()*
 	bufname(3)		name of buffer 3
 	bufname("%")		name of current buffer
 	bufname("file2")	name of buffer where "file2" matches.
-<							*buffer_name()*
-		Obsolete name: buffer_name().
 
 							*bufnr()*
 bufnr({expr} [, {create}])
@@ -2471,10 +2467,6 @@ bufnr({expr} [, {create}])
 		of existing buffers.  Note that not all buffers with a smaller
 		number necessarily exist, because ":bwipeout" may have removed
 		them.  Use bufexists() to test for the existence of a buffer.
-							*buffer_number()*
-		Obsolete name: buffer_number().
-							*last_buffer_nr()*
-		Obsolete name for bufnr("$"): last_buffer_nr().
 
 bufwinnr({expr})					*bufwinnr()*
 		The result is a Number, which is the number of the first
@@ -3262,8 +3254,6 @@ filereadable({file})					*filereadable()*
 		expression, which is used as a String.
 		If you don't care about the file being readable you can use
 		|glob()|.
-							*file_readable()*
-		Obsolete name: file_readable().
 
 
 filewritable({file})					*filewritable()*
@@ -4186,8 +4176,6 @@ hlexists({name})					*hlexists()*
 		defined in some way.  Not necessarily when highlighting has
 		been defined for it, it may also have been used for a syntax
 		item.
-							*highlight_exists()*
-		Obsolete name: highlight_exists().
 
 							*hlID()*
 hlID({name})	The result is a Number, which is the ID of the highlight group
@@ -4197,8 +4185,6 @@ hlID({name})	The result is a Number, which is the ID of the highlight group
 		group.	For example, to get the background color of the
 		"Comment" group: >
 	:echo synIDattr(synIDtrans(hlID("Comment")), "bg")
-<							*highlightID()*
-		Obsolete name: highlightID().
 
 hostname()						*hostname()*
 		The result is a String, which is the name of the machine on
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 60acfbf700..1d170c3b38 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1449,9 +1449,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	comment text.  Currently only used to add markers for folding, see
 	|fold-marker|.
 
-			*'compatible'* *'cp'* *'nocompatible'* *'nocp'*
-'compatible' 'cp'	Removed. |vim-differences| {Nvim}
-
 						*'complete'* *'cpt'* *E535*
 'complete' 'cpt'	string	(default: ".,w,b,u,t")
 			local to buffer
@@ -1848,9 +1845,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 			the cursor would skip over it and jump to the
 			following occurrence.
 
-						*'cryptmethod'* *'cm'*
-'cryptmethod'		Removed. |vim-differences| {Nvim}
-
 						*'cscopepathcomp'* *'cspc'*
 'cscopepathcomp' 'cspc'	number	(default 0)
 			global
@@ -2129,9 +2123,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 		hor	horizontally, height of windows is not affected
 		both	width and height of windows is affected
 
-			   *'ed'* *'edcompatible'* *'noed'* *'noedcompatible'*
-'edcompatible' 'ed'	Removed. |vim-differences| {Nvim}
-
 					*'encoding'* *'enc'* *E543*
 'encoding' 'enc'	string (default: "utf-8")
 			global
@@ -2337,11 +2328,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 	This option can not be changed when 'modifiable' is off.
 
-							*'fe'*
-	NOTE: Before version 6.0 this option specified the encoding for the
-	whole of Vim, this was a mistake.  Now use 'encoding' instead.  The
-	old short name was 'fe', which is no longer used.
-
 					*'fileencodings'* *'fencs'*
 'fileencodings' 'fencs'	string (default: "ucs-bom,utf-8,default,latin1")
 			global
@@ -3164,9 +3150,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 		removing it after the GUI has started has no effect.
 
 
-						*'guipty'* *'noguipty'*
-'guipty'		Removed. |vim-differences| {Nvim}
-
 						*'guitablabel'* *'gtl'*
 'guitablabel' 'gtl'	string	(default empty)
 			global
@@ -3411,12 +3394,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Can be overruled by using "\c" or "\C" in the pattern, see
 	|/ignorecase|.
 
-						*'imactivatefunc'* *'imaf'*
-'imactivatefunc' 'imaf'	Removed. |vim-differences| {Nvim}
-
-						*'imactivatekey'* *'imak'*
-'imactivatekey' 'imak'	Removed. |vim-differences| {Nvim}
-
 				*'imcmdline'* *'imc'* *'noimcmdline'* *'noimc'*
 'imcmdline' 'imc'	boolean (default off)
 			global
@@ -3473,9 +3450,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The value is set to 1 when it is not -1 and setting the 'keymap'
 	option to a valid keymap name.
 
-						*'imstatusfunc'* *'imsf'*
-'imstatusfunc' 'imsf'	Removed. |vim-differences| {Nvim}
-
 						*'include'* *'inc'*
 'include' 'inc'		string	(default "^\s*#\s*include")
 			global or local to buffer |global-local|
@@ -3732,9 +3706,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Insert two spaces after a '.', '?' and '!' with a join command.
 	Otherwise only one space is inserted.
 
-					*'key'*
-'key'			Removed. |vim-differences| {Nvim}
-
 					*'keymap'* *'kmp'* *E544*
 'keymap' 'kmp'		string	(default "")
 			local to buffer
@@ -4013,9 +3984,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Note that using the "-u NONE" and "--noplugin" command line arguments
 	reset this option. |-u| |--noplugin|
 
-						*'macatsui'* *'nomacatsui'*
-'macatsui'		Removed. |vim-differences| {Nvim}
-
 						*'magic'* *'nomagic'*
 'magic'			boolean	(default on)
 			global
@@ -4859,9 +4827,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	For the ":substitute" command the number of substitutions is used
 	instead of the number of lines.
 
-			 *'restorescreen'* *'rs'* *'norestorescreen'* *'nors'*
-'restorescreen' 'rs'	Removed. |vim-differences| {Nvim}
-
 				*'revins'* *'ri'* *'norevins'* *'nori'*
 'revins' 'ri'		boolean	(default off)
 			global
@@ -5569,9 +5534,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	    shm=a	Abbreviation, but no loss of information.
 	    shm=at	Abbreviation, and truncate message when necessary.
 
-				 *'shortname'* *'sn'* *'noshortname'* *'nosn'*
-'shortname' 'sn'	Removed. |vim-differences| {Nvim}
-
 						*'showbreak'* *'sbr'* *E595*
 'showbreak' 'sbr'	string	(default "")
 			global
@@ -6185,9 +6147,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option is used together with 'bufhidden' and 'buftype' to
 	specify special kinds of buffers.   See |special-buffers|.
 
-						*'swapsync'* *'sws'*
-'swapsync' 'sws'	Removed. |vim-differences| {Nvim}
-
 						*'switchbuf'* *'swb'*
 'switchbuf' 'swb'	string	(default "")
 			global
@@ -6411,9 +6370,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Resetting this option is useful when using a ":tag" command in a
 	mapping which should not change the tagstack.
 
-						*'term'* *E529* *E530* *E531*
-'term'			Removed. |vim-differences| {Nvim}
-
 						*'termbidi'* *'tbidi'*
 						*'notermbidi'* *'notbidi'*
 'termbidi' 'tbidi'	boolean (default off)
@@ -6427,9 +6383,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	'arabicshape' is ignored, but 'rightleft' isn't changed automatically.
 	For further details see |arabic.txt|.
 
-					*'termencoding'* *'tenc'*
-'termencoding' 'tenc'	Removed. |vim-differences| {Nvim}
-
 						*'termguicolors'* *'tgc'*
 'termguicolors' 'tgc'	boolean (default off)
 			global
@@ -6584,27 +6537,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	to be garbled (e.g., when it contains a CR or NL character).
 	{not available when compiled without the |+statusline| feature}
 
-				*'toolbar'* *'tb'*
-'toolbar' 'tb'		Removed. |vim-differences| {Nvim}
-
-						*'toolbariconsize'* *'tbis'*
-'toolbariconsize' 'tbis'	Removed. |vim-differences| {Nvim}
-
-			     *'ttybuiltin'* *'tbi'* *'nottybuiltin'* *'notbi'*
-'ttybuiltin' 'tbi'	Removed. |vim-differences| {Nvim}
-
 				     *'ttyfast'* *'tf'* *'nottyfast'* *'notf'*
 'ttyfast' 'tf'		Removed. |vim-differences| {Nvim}
 
-						*'ttymouse'* *'ttym'*
-'ttymouse' 'ttym'	Removed. |vim-differences| {Nvim}
-
-						*'ttyscroll'* *'tsl'*
-'ttyscroll' 'tsl'	Removed. |vim-differences| {Nvim}
-
-						*'ttytype'* *'tty'*
-'ttytype' 'tty'		Alias for 'term'. Removed. |vim-differences| {Nvim}
-
 						*'undodir'* *'udir'* *E926*
 'undodir' 'udir'	string	(default "$XDG_DATA_HOME/nvim/undo")
 			global
@@ -6759,12 +6694,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	with Unix.  The Unix version of Vim cannot source dos format scripts,
 	but the Windows version of Vim can source unix format scripts.
 
-				*'viminfo'* *'vi'*
-'viminfo' 'vi'		string
-			global
-	Deprecated alias for 'shada' option. Is kept for compatibility 
-	reasons.
-
 					    *'virtualedit'* *'ve'*
 'virtualedit' 've'	string	(default "")
 			global
@@ -6810,9 +6739,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Give a warning message when a shell command is used while the buffer
 	has been changed.
 
-		     *'weirdinvert'* *'wiv'* *'noweirdinvert'* *'nowiv'*
-'weirdinvert' 'wiv'	Removed. |vim-differences| {Nvim}
-
 						*'whichwrap'* *'ww'*
 'whichwrap' 'ww'	string	(Vim default: "b,s", Vi default: "")
 			global
diff --git a/runtime/doc/provider.txt b/runtime/doc/provider.txt
index 63dbb00896..a8b5966950 100644
--- a/runtime/doc/provider.txt
+++ b/runtime/doc/provider.txt
@@ -12,16 +12,16 @@ Nvim delegates some features to dynamic "providers".
 Python integration		    	      *provider-python*
 
 Nvim supports the Vim legacy |python-vim| and |python3| interfaces via
-external Python interpreters connected via |RPC|,
-
+external Python interpreters connected via |RPC|.
 Note: Only the Vim 7.3 API is supported; bindeval (Vim 7.4) is not.
 
-
 PYTHON QUICKSTART ~
 
-If you used a package manager to install Nvim there's a good chance that
-it also provides the `neovim` Python package. If it doesn't, follow these
-steps to install the package with Python's package manager, `pip`.
+If you used a package manager to install Nvim, you might already have the
+required `neovim` Python package. Run |:CheckHealth| to see if your system is
+up-to-date.
+
+Following are steps to install the package with Python's `pip` tool.
 
 Note: Depending on your system, `pip` might refer to Python 2 or Python 3,
       which is why the following instructions mention `pip2` or `pip3`
@@ -74,24 +74,19 @@ Note: This requires you to install the python3-neovim module properly. >
     let g:python3_host_skip_check = 1
 
 
-TROUBLESHOOTING					*python-trouble*
-
-If you have trouble with a plugin that uses the `neovim` Python client, use
-the |:CheckHealth| command to diagnose your setup.
-
 ==============================================================================
 Ruby integration		    	      *provider-ruby*
 
 Nvim supports the Vim legacy |ruby-vim| interface via external Ruby
 interpreters connected via |RPC|.
 
+Run |:CheckHealth| to see if your system is up-to-date.
 
 RUBY QUICKSTART ~
 
 To use Vim Ruby plugins with Nvim, just install the latest `neovim` RubyGem: >
     $ gem install neovim
 
-
 RUBY PROVIDER CONFIGURATION ~
 						*g:loaded_ruby_provider*
 To disable Ruby support: >
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index e2a44541ae..44d68c7b38 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -1507,12 +1507,6 @@ However, to properly parse such a complex file, an external filter should
 be used.  See the description further above how to make such a filter known
 by Vim.
 
-						*errorformat-Perl*
-In $VIMRUNTIME/tools you can find the efm_perl.pl script, which filters Perl
-error messages into a format that quickfix mode will understand.  See the
-start of the file about how to use it.  (This script is deprecated, see
-|compiler-perl|.)
-
 
 
  vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/quotes.txt b/runtime/doc/quotes.txt
deleted file mode 100644
index c35fb2f139..0000000000
--- a/runtime/doc/quotes.txt
+++ /dev/null
@@ -1,275 +0,0 @@
-*quotes.txt*    For Vim version 7.4.  Last change: 2010 Nov 03
-
-
-		  VIM REFERENCE MANUAL    by Bram Moolenaar
-
-
-							*quotes*
-Here are some nice quotes about Vim that I collected from news and mail.
-
-
-vim (vim) noun - Ebullient vitality and energy.  [Latin, accusative of vis,
-strength]  (Dictionary)
-
-Vim is so much better than vi that a great many of my old vi :map's became
-immediately obsolete! (Tony Nugent, Australia)
-
-Coming with a very GUI mindset from Windows, I always thought of people using
-Vi as some kind of outer space alien in human clothes.  Once I tried I really
-got addicted by its power and now I found myself typing Vim keypresses in the
-oddest places! That's why I would like to see Vim embedded in every
-application which deals with text editing.  (José Fonseca)
-
-I was a 12-year emacs user who switched to Vim about a year ago after finally
-giving up on the multiple incompatible versions, flaky contributed packages,
-disorganized keystrokes, etc.  And it was one of the best moves I ever made.
-(Joel Burton)
-
-Although all of the programs were used during the preparation of the new and
-revised material, most of the editing was done with Vim versions 4.5 and 5.0
-under GNU-Linux (Redhat 4.2).  (Arnold Robbins, Israel, author of "Learning
-the Vi editor")
-
-Out of all the open software i've ever seen and used, and i've seen a lot, Vim
-is the best, most useful and highest quality to work with, second only to the
-linux kernel itself.  (Peter Jay Salzman)
-
-It's well worth noting that the _entirety_ of SourceForge was written using
-Vim and its nifty PHP syntax highlighting.  I think the entire SF.net tech
-staff uses Vim and we're all excited to have you aboard! (Tim Perdue)
-
-Vim is one of a select bunch of tools for which I have no substitute.  It is
-a brilliant piece of work! (Biju Chacko)
-
-A previous girlfriend of mine switched to emacs.  Needless to say, the
-relationship went nowhere.  (Geoffrey Mann)
-
-I rarely think about Vim, in the same way that I guess a fish rarely thinks
-about water.  It's the environment in which everything else happens.  I'm a
-fairly busy system administrator working on a lot of different platforms.  Vim
-is the only thing that's consistent across all my systems, and it's just about
-the only thing that doesn't break from time to time.  When a new system comes
-in the door without Vim, I install it right away.  Great to have a tool that's
-the same everywhere, that's completely reliable, so I can ignore it and think
-about other things.  (Pete Schaeffer)
-
-Having recently succeeded in running Vim via telnet through a Nokia
-Communicator, I can now report that it works nicely on a Palm Pilot too.
-(Allan Kelly, Scotland)
-
-You've done a tremendous job with 'VIM', Bram!  The more I use it, the more
-impressed I get (I am an old 'vi' die hard who once started out with early
-versions of 'emacs' in the late 1970's and was relieved by finding 'vi' in the
-first UNIX I came across in 1983).  In my opinion, it's about time 'VIM'
-replace 'emacs' as the standard for top editors.  (Bo Thide', Sweden)
-
-I love and use VIM heavily too.  (Larry Wall)
-
-Vi is like a Ferrari, if you're a beginner, it handles like a bitch, but once
-you get the hang of it, it's small, powerful and FAST! (Unknown)
-VIM is like a new model Ferrari, and sounds like one too - "VIIIIIIMMM!"
-(Stephen Riehm, Germany)
-
-Schon bei Nutzung eines Bruchteils der VIM-Funktionen wird der Benutzer recht
-schnell die Vorzuege dieses Editors kennen- und schaetzenlernen.
-Translated: Even when only using a fraction of VIM-functions, the user will
-quickly get used to and appreciate the advantages of this editor.  (Garry
-Glendown, conclusion of an article on VIM in iX magazine 9/1998)
-
-I've recently acquired the O'Reilly book on VI (it also discusses VIM
-in-depth), and I'm amazed at just how powerful this application is.  (Jeffrey
-Rankin)
-
-This guide was written using the Windows 9.x distribution of GVIM, which is
-quite possibly the greatest thing to come along since God created the naked
-girl.  (Michael DiBernardo)
-
-Boy, I thought I knew almost everything about VIM, but every time I browse the
-online documentation, I hit upon a minor but cool aspect of a VIM feature that
-I didn't know before!  I must say the documentation is one the finest I've
-ever seen in a product -- even better than most commercial products.
-(Gautam Mudunuri)
-
-VIM 4.5 is really a fantastic editor.  It has sooooo many features and more
-importantly, the defaults are so well thought out that you really don't have
-to change anything!!  Words cannot express my amazement and gratitude to the
-creators of VIM.  Keep it up.  (Vikas, USA)
-
-I wonder how long it will be before people will refer to other Vi editors as
-VIM clones?  (Darren Hiebert)
-
-I read about [auto-positioning-in-file-based-on-the-errors-from-make] in one
-of those "Perfect Programmer's Editor" threads and was delighted to discover
-that VIM already supports it.  (Brendan Macmillan, Australia)
-
-I just discovered VIM (5.0) and I'm telling everyone I know about it!
-I tell them VIM stands for VI for the new (M)illenium.  Thanks so much!
-(Matt F. Valentine)
-
-I think from now on "vi" should be called "Vim Imitation", not the other way
-around.  (Rungun Ramanathan)
-
-The Law of VIM:
-For each member b of the possible behaviour space B of program P, there exists
-a finite time t before which at least one user u in the total user space U of
-program P will request b becomes a member of the allowed behaviour space B'
-(B' <= B).
-In other words: Sooner or later everyone wants everything as an option.
-(Negri)
-
-Whenever I move to a new computing platform, the first thing I do is to port
-VIM.  Lately, I am simply stunned by its ease of compilation using the
-configure facility.  (A.M. Sabuncu, Turkey)
-
-The options are really excellent and very powerful.  (Anish Maharaj)
-
-The Spring user-interface designs are in, and word from the boutiques is that
-80x24 text-only mode is back with a *vengeance! Vi editor clone VIM burst onto
-March desk-tops with a dazzling show of pastel syntax highlights for its 5.0
-look.  Strident and customizable, VIM raises eyebrows with its interpretation
-of the classic Vi single-key macro collection.
-http://www.ntk.net/index.cgi?back=archive98/now0327.txt&line=179#l
-
-I just wanted to take this opportunity to let you know that VIM 5 ROCKS!
-Syntax highlighting: how did I survive without it?!  Thank you for creating
-mankind's best editor!  (Mun Johl, USA)
-
-Thanks again for VIM.  I use it every day on Linux.  (Eric Foster-Johnson,
-author of the book "UNIX Programming Tools")
-
-The BEST EDITOR EVER (Stuart Woolford)
-
-I have used most of VIM's fancy features at least once, many frequently, and I
-can honestly say that I couldn't live with anything less anymore.  My
-productivity has easily doubled compared to what it was when I used vi.
-(Sitaram Chamarty)
-
-I luv VIM.  It is incredible.  I'm naming my first-born Vimberly.  (Jose
-Unpingco, USA)
-
-Hint:  "VIM" is "vi improved" - much better! (Sven Guckes, Germany)
-
-I use VIM every day.  I spend more time in VIM than in any other program...
-It's the best vi clone there is.  I think it's great.  (Craig Sanders,
-Australia)
-
-I strongly advise using VIM--its infinite undo/redo saved me much grief.
-(Terry Brown)
-
-Thanks very much for writing what in my opinion is the finest text editor on
-the planet.  If I were to get another cat, I would name it "Vim".
-(Bob Sheehan, USA)
-
-I typed :set all and the screen FILLED up with options.  A whole screen of
-things to be set and unset.  I saw some of my old friends like wrapmargin,
-modelines and showmode, but the screen was FILLED with new friends!   I love
-them all!   I love VIM!   I'm so happy that I've found this editor!  I feel
-like how I once felt when I started using vi after a couple of years of using
-ed.  I never thought I'd forsake my beloved ed, but vi ... oh god, vi was
-great.  And now, VIM.  (Peter Jay Salzman, USA)
-
-I am really happy with such a wonderful software package.  Much better than
-almost any expensive, off the shelf program.  (Jeff Walker)
-
-Whenever I reread the VIM documentation I'm overcome with excitement at the
-power of the editor.  (William Edward Webber, Australia)
-
-Hurrah for VIM!! It is "at your fingertips" like vi, and has the extensions
-that vi sorely needs: highlighting for executing commands on blocks, an easily
-navigable and digestible help screen, and more.  (Paul Pax)
-
-The reason WHY I don't have this amazingly useful macro anymore, is that I
-now use VIM - and this is built in!! (Stephen Riehm, Germany)
-
-I am a user of VIM and I love it.  I use it to do all my programming, C,
-C++, HTML what ever.  (Tim Allwine)
-
-I discovered VIM after years of struggling with the original vi, and I just
-can't live without it anymore.  (Emmanuel Mogenet, USA)
-
-Emacs has not a bit of chance to survive so long as VIM is around.  Besides,
-it also has the most detailed software documentation I have ever seen---much
-better than most commercial software!  (Leiming Qian)
-
-This version of VIM will just blow people apart when they discover just how
-fantastic it is! (Tony Nugent, Australia)
-
-I took your advice & finally got VIM & I'm really impressed.  Instant convert.
-(Patrick Killelea, USA)
-
-VIM is by far my favorite piece of shareware and I have been particularly
-pleased with version 3.0.  This is really a solid piece of work.  (Robert
-Colon, USA)
-
-VIM is a joy to use, it is so well thought and practical that I wonder why
-anybody would use visual development tools.  VIM is powerful and elegant, it
-looks deceptively simple but is almost as complex as a 747 (especially when I
-look at my growing vimrc), keep up that wonderful job, VIM is a centerpiece
-of the free software world.  (Louis-David Mitterand, USA)
-
-I cannot believe how great it is to use VIM.  I think the guys at work are
-getting tired of hearing me bragging about it.  Others eyes are lighting up.
-(Rick Croote)
-
-Emacs takes way too much time to start up and run, it is too big and bulky for
-effective use and the interface is more confusing than it is of any help.  VIM
-however is short, it is fast, it is powerful, it has a good interface and it
-is all purpose.  (Paal Ditlefsen Ekran)
-
-From the first time I got VIM3.0, I was very enthusiastic.  It has almost no
-problems.  The swapfile handling and the backup possibilities are robust, also
-the protection against editing one file twice.  It is very compatible to the
-real VI (and that is a MUST, because my brain is trained over years in using
-it).  (Gert van Antwerpen, Holland)
-
-Visual mode in VIM is a very powerful thing! (Tony Nugent, Australia)
-
-I have to say that VIM is =THE= single greatest piece of source code to ever
-come across the net (Jim Battle, USA).
-
-In fact, if you do want to get a new vi I'd suggest VIM-3.0.  This is, by
-far, the best version of vi I've ever seen (Albert W. Schueller).
-
-I should mention that VIM is a very good editor and can compete with anything
-(Ilya Beloozerov).
-
-To tell the truth sometimes I used elvis, vile, xvi, calvin, etc.  And this is
-the reason that I can state that VIM is the best! (Ferenc Deak, Hungary)
-
-VIM is by far the best editor that I have used in a long time, and I have
-looked at just about every thing that is available for every platform that I
-use.  VIM is the best on all of them.  (Guy L. Oliver)
-
-VIM is the greatest editor since the stone chisel.  (Jose Unpingco, USA)
-
-I would like to say that with VIM I am finally making the 'emacs to vi'
-transition - as an Editor it is so much better in many ways: keyboard layout,
-memory usage, text alteration to name 3.  (Mark Adam)
-
-In fact, now if I want to know what a particular setting does in vi, I fire up
-VIM and check out its help!  (Nikhil Patel, USA)
-
-As a vi user, VIM has made working with text a far more pleasant task than
-before I encountered this program.  (Steinar Knutsen, Norway)
-
-I use VIM since version 3.0.  Since that time, it is the ONLY editor I use,
-with Solaris, Linux and OS/2 Warp.  I suggest all my friends to use VIM, they
-try, and they continue using it.  VIM is really the best software I have ever
-downloaded from the Internet, and the best editor I know of.  (Marco
-Eccettuato, Italy)
-
-
-In summary:
-     __     ___		    _	    _	_  ___ _____ `
-     \ \   / (_)_ __ ___   (_)___  | | | |/ _ \_   _| `
-      \ \ / /| | '_ ` _ \  | / __| | |_| | | | || | `
-       \ V / | | | | | | | | \__ \ |  _  | |_| || | `
-	\_/  |_|_| |_| |_| |_|___/ |_| |_|\___/ |_| `
-	     ____ _____ _   _ _____ _____ _ _ `
-	    / ___|_   _| | | |	___|  ___| | | `
-	    \___ \ | | | | | | |_  | |_  | | | `
-	     ___) || | | |_| |	_| |  _| |_|_| `
-	    |____/ |_|	\___/|_|   |_|	 (_|_)	    (Tony Nugent, Australia) `
-
-
- vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index c6f51d47b9..dccbe2562e 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1178,9 +1178,6 @@ running) you have additional options:
 			already set (registers, marks, |v:oldfiles|, etc.)
 			will be overwritten.
 
-						   *:rv* *:rviminfo*
-:rv[iminfo][!] [file]	Deprecated alias to |:rshada| command.
-
 						    *:wsh* *:wshada* *E137*
 :wsh[ada][!] [file]	Write to ShaDa file [file] (default: see above).
 			The information in the file is first read in to make
@@ -1196,9 +1193,6 @@ running) you have additional options:
 
 			Note: Executing :wshada will reset all |'quote| marks.
 
-						   *:wv* *:wviminfo*
-:wv[iminfo][!] [file]	Deprecated alias to |:wshada| command.
-
 						*:o* *:ol* *:oldfiles*
 :o[ldfiles]		List the files that have marks stored in the ShaDa
 			file.  This list is read on startup and only changes
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index d9440b6df8..308fa90ab3 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -4926,8 +4926,6 @@ TabLineSel	tab pages line, active tab page label
 Title		titles for output from ":set all", ":autocmd" etc.
 							*hl-Visual*
 Visual		Visual mode selection
-							*hl-VisualNOS*
-VisualNOS	Removed. |vim-differences| {Nvim}
 							*hl-WarningMsg*
 WarningMsg	warning messages
 							*hl-WildMenu*
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index dd4dbc1272..c505652b1b 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -220,10 +220,12 @@ planned for the current milestone.
 
 These features are in Vim, but have been intentionally removed from Nvim.
 
-Vi-compatible mode:
+			*'cp'* *'nocompatible'* *'nocp'* *'compatible'*
+Nvim is always "non-compatible" with Vi.
   ":set nocompatible" is ignored
   ":set compatible" is an error
 
+			*'ed'* *'edcompatible'* *'noed'* *'noedcompatible'*
 Ed-compatible mode:
   ":set noedcompatible" is ignored
   ":set edcompatible" is an error
@@ -233,8 +235,8 @@ Ed-compatible mode:
   ":set nottyfast" is an error
 
 Encryption support:
-  'cryptmethod'
-  'key'
+  *'cryptmethod'* *'cm'*
+  *'key'*
 
 MS-DOS support:
   'bioskey'
@@ -245,27 +247,27 @@ Highlight groups:
 
 Other options:
   'antialias'
-  'cpoptions' ('g', 'w', 'H', '*', '-', 'j', and all POSIX flags were removed)
-  'guioptions' (only the 't' flag was removed)
-  'guipty'
-  'imactivatefunc'
-  'imactivatekey'
-  'imstatusfunc'
-  'macatsui'
-  'restorescreen'
+  'cpoptions' ("g", "w", "H", "*", "-", "j", and all POSIX flags were removed)
+  'guioptions' "t" flag was removed
+  *'guipty'* (Nvim uses pipes and PTYs consistently on all platforms.)
+  *'imactivatefunc'* *'imaf'*
+  *'imactivatekey'* *'imak'*
+  *'imstatusfunc'* *'imsf'*
+  *'macatsui'*
+  *'restorescreen'* *'rs'* *'norestorescreen'* *'nors'*
   'shelltype'
-  'shortname'
-  'swapsync'
-  'term'
-  'termencoding' (Vim 7.4.852 also removed this for Windows)
+  *'shortname'* *'sn'* *'noshortname'* *'nosn'*
+  *'swapsync'* *'sws'*
+  *'term'* *E529* *E530* *E531*
+  *'termencoding'* *'tenc'* (Vim 7.4.852 also removed this for Windows)
   'textauto'
   'textmode'
-  'toolbar'
-  'toolbariconsize'
-  'ttybuiltin'
-  'ttymouse'
-  'ttyscroll'
-  'ttytype'
+  *'toolbar'* *'tb'*
+  *'toolbariconsize'* *'tbis'*
+  *'ttybuiltin'* *'tbi'* *'nottybuiltin'* *'notbi'*
+  *'ttymouse'* *'ttym'*
+  *'ttyscroll'* *'tsl'*
+  *'ttytype'* *'tty'*
   'weirdinvert'
 
 Other commands: