4 files changed, 4 insertions, 30 deletions
diff --git a/runtime/doc/debugger.txt b/runtime/doc/debugger.txt
index 7806419d4e..f1eb5639bd 100644
--- a/runtime/doc/debugger.txt
+++ b/runtime/doc/debugger.txt
@@ -7,8 +7,6 @@
 Debugger Support Features				*debugger-support*
 
 1. Debugger Features		|debugger-features|
-2. Vim Compile Options		|debugger-compilation|
-3. Integrated Debuggers		|debugger-integration|
 
 ==============================================================================
 1. Debugger Features					*debugger-features*
@@ -106,29 +104,4 @@ Another way to use the balloon is with the 'balloonexpr' option.  This is
 completely user definable.
 
 ==============================================================================
-2. Vim Compile Options					*debugger-compilation*
-
-The debugger features were added explicitly for use with Sun's Visual
-WorkShop Integrated Programming Environment (ipe).  However, they were done
-in as generic a manner as possible so that integration with other debuggers
-could also use some or all of the tools used with Sun's ipe.
-
-The following compile time preprocessor variables control the features:
-
-    Alternate Command Input			ALT_X_INPUT
-    Debug Glyphs				FEAT_SIGNS
-    Debug Highlights				FEAT_SIGNS
-    Message Footer				FEAT_FOOTER
-    Balloon Evaluation				FEAT_BEVAL
-
-The first integration with a full IPE/IDE was with Sun Visual WorkShop.  To
-compile a gvim which interfaces with VWS set the following flag, which sets
-all the above flags:
-
-    Sun Visual WorkShop				FEAT_SUN_WORKSHOP
-
-==============================================================================
-3. Integrated Debuggers					*debugger-integration*
-
-
  vim:tw=78:sw=4:ts=8:ft=help:norl:
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 439c8778cc..ead5f7d50a 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -6771,7 +6771,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	by user preferences or the current theme is used.
 
 			     *'ttybuiltin'* *'tbi'* *'nottybuiltin'* *'notbi'*
-'ttybuiltin' 'tbi'	Removed. {Nvim}
+'ttybuiltin' 'tbi'	Removed. |vim-differences| {Nvim}
 
 				     *'ttyfast'* *'tf'* *'nottyfast'* *'notf'*
 'ttyfast' 'tf'		Removed. |vim-differences| {Nvim}
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 6419ecb628..976a9f5e2b 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -231,7 +231,7 @@ g8			Print the hex values of the bytes used in the
 			and |nvim-terminal-emulator| for more information.
 
 							*:!cmd* *:!* *E34*
-:!{cmd}			Execute {cmd} with the shell. See also 'shell'.
+:!{cmd}			Execute {cmd} with 'shell'. See also |:terminal|.
 
 			Any '!' in {cmd} is replaced with the previous
 			external command (see also 'cpoptions').  But not when
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 4ad559600a..9247ebe983 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -115,11 +115,12 @@ MS-DOS support:
 
 Other options:
   'macatsui'
-  'shortname'
   'shelltype'
+  'shortname'
   'termencoding'
   'textauto'
   'textmode'
+  'ttybuiltin'
 
 Other commands:
   :fixdel