5 files changed, 34 insertions, 20 deletions
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index cbe017e051..786097dd74 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -450,7 +450,7 @@ notation	meaning		    equivalent	decimal value(s)	~
 <k0> - <k9>	keypad 0 to 9			*keypad-0* *keypad-9*
 <S-...>		shift-key			*shift* *<S-*
 <C-...>		control-key			*control* *ctrl* *<C-*
-<M-...>		alt-key or meta-key		*meta* *alt* *<M-*
+<M-...>		alt-key or meta-key		*META* *meta* *alt* *<M-*
 <A-...>		same as <M-...>			*<A-*
 <D-...>		command-key or "super" key	*<D-*
 <t_xx>		key with "xx" entry in termcap
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index bcd9c08c26..94c5e2d11d 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -3416,6 +3416,15 @@ 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.
 
+						*'inccommand'* *'icm'*
+'inccommand' 'icm'	string	(default "")
+			global
+			
+	"nosplit" : Shows the effects of a command incrementally, as you type.
+	"split"	  : Also shows partial off-screen results in a preview window.
+
+	Currently only works for |:substitute|. |hl-Substitute|
+
 						*'include'* *'inc'*
 'include' 'inc'		string	(default "^\s*#\s*include")
 			global or local to buffer |global-local|
@@ -3896,6 +3905,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			global
 	Strings to use in 'list' mode and for the |:list| command.  It is a
 	comma separated list of string settings.
+
 							*lcs-eol*
 	  eol:c		Character to show at the end of each line.  When
 			omitted, there is no extra character at the end of the
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 308fa90ab3..a9762a7121 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -4852,6 +4852,9 @@ SignColumn	column where |signs| are displayed
 							*hl-IncSearch*
 IncSearch	'incsearch' highlighting; also used for the text replaced with
 		":s///c"
+							*hl-Substitute*
+Substitute	|:substitute| replacement text highlighting
+
 							*hl-LineNr*
 LineNr		Line number for ":number" and ":#" commands, and when 'number'
 		or 'relativenumber' option is set.
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 590994b7aa..c4795bec57 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -63,7 +63,7 @@ these differences.
 3. New Features						       *nvim-features*
 
 
-MAJOR FEATURES ~
+MAJOR COMPONENTS ~
 
 Embedded terminal emulator	|terminal-emulator|
 RPC API				|RPC|
@@ -84,25 +84,29 @@ avoids features that cannot be provided on all platforms--instead that is
 delegated to external plugins/extensions.
 
 
-OTHER FEATURES ~
+ARCHITECTURE ~
 
-|bracketed-paste-mode| is built-in and enabled by default.
+External plugins run in separate processes. |remote-plugin| This improves
+stability and allows those plugins to perform tasks without blocking the
+editor. Even "legacy" Python and Ruby plugins which use the old Vim interfaces
+(|if_py| and |if_ruby|) run out-of-process.
+
+
+FEATURES ~
 
-Meta (alt) chords are recognized (even in the terminal).
-  <M-1>, <M-2>, ...
-  <M-BS>, <M-Del>, <M-Ins>, ...
-  <M-/>, <M-\>, ...
-  <M-Space>, <M-Enter>, <M-=>, <M-->, <M-?>, <M-$>, ...
+|bracketed-paste-mode| is built-in and enabled by default.
 
-  Note: Meta chords are case-sensitive (<M-a> is distinguished from <M-A>).
+|META| (ALT) chords are recognized, even in the terminal. Any |<M-| mapping
+will work. Some examples: <M-1>, <M-2>, <M-BS>, <M-Del>, <M-Ins>, <M-/>,
+<M-\>, <M-Space>, <M-Enter>, <M-=>, <M-->, <M-?>, <M-$>, ...
+META chords are case-sensitive: <M-a> and <M-A> are two different keycodes.
 
 Some `CTRL-SHIFT-...` key chords are distinguished from `CTRL-...` variants
 (even in the terminal). Specifically, the following are known to work:
-  <C-Tab>, <C-S-Tab>
-  <C-BS>, <C-S-BS>
-  <C-Enter>, <C-S-Enter>
+  <C-Tab>, <C-S-Tab>, <C-BS>, <C-S-BS>, <C-Enter>, <C-S-Enter>
 
 Options:
+  'inccommand' shows results while typing a |:substitute| command
   'statusline' supports unlimited alignment sections
   'tabline' %@Func@foo%X can call any function on mouse-click
 
@@ -123,12 +127,13 @@ Functions:
 
 Events:
   |TabNewEntered|
-  |TermOpen|
   |TermClose|
+  |TermOpen|
   |TextYankPost|
 
 Highlight groups:
   |hl-QuickFixLine|
+  |hl-Substitute|
   |hl-TermCursor|
   |hl-TermCursorNC|
 
@@ -295,6 +300,7 @@ Other commands:
   :mode (no longer accepts an argument)
   :open
   :shell
+  :smile
   :tearoff
 
 Other compile-time features:
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index 32e871ea79..ae01c0f3ee 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -1,9 +1,4 @@
 " Vim syntax file
-" Language:	Vim 7.4 script
-" Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	March 29, 2016
-" Version:	7.4-45
-" Automatically generated keyword lists: {{{1
 
 " #############################################################################
 " #############################################################################
@@ -61,7 +56,7 @@ syn keyword vimGroup contained	Comment Constant String Character Number Boolean
 syn keyword vimHLGroup contained	ColorColumn Cursor CursorColumn CursorIM CursorLine CursorLineNr DiffAdd DiffChange DiffDelete DiffText Directory ErrorMsg FoldColumn Folded IncSearch LineNr MatchParen Menu ModeMsg MoreMsg NonText Normal Pmenu PmenuSbar PmenuSel PmenuThumb Question Scrollbar Search SignColumn SpecialKey SpellBad SpellCap SpellLocal SpellRare StatusLine StatusLineNC TabLine TabLineFill TabLineSel Title Tooltip VertSplit Visual WarningMsg WildMenu
 syn match vimHLGroup contained	"Conceal"
 syn keyword vimOnlyHLGroup contained	VisualNOS
-syn keyword nvimHLGroup contained	EndOfBuffer TermCursor TermCursorNC QuickFixLine
+syn keyword nvimHLGroup contained	EndOfBuffer IncSubstitute TermCursor TermCursorNC QuickFixLine
 "}}}2
 syn case match
 " Special Vim Highlighting (not automatic) {{{1