test: spellcheck :help (vimdoc) files #24109

Enforce consistent terminology (defined in
`gen_help_html.lua:spell_dict`) for common misspellings.

This does not spellcheck English in general (perhaps a future TODO,
though it may be noisy).

15 files changed, 81 insertions, 82 deletions

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 9adca7620f..bd8bce9737 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -7,7 +7,7 @@
 Nvim API                                                           *API* *api*
 
 Nvim exposes a powerful API that can be used by plugins and external processes
-via |RPC|, |Lua| and VimL (|eval-api|).
+via |RPC|, |Lua| and Vimscript (|eval-api|).
 
 Applications can also embed libnvim to work with the C API directly.
 
@@ -587,7 +587,7 @@ nvim__get_runtime({pat}, {all}, {*opts})                 *nvim__get_runtime()*
     Parameters: ~
       • {pat}   pattern of files to search for
       • {all}   whether to return all matches or only the first
-      • {opts}  is_lua: only search lua subdirs
+      • {opts}  is_lua: only search Lua subdirs
 
     Return: ~
         list of absolute paths to the found files
@@ -1203,7 +1203,7 @@ nvim_open_term({buffer}, {opts})                            *nvim_open_term()*
     Parameters: ~
       • {buffer}  the buffer to use (expected to be empty)
       • {opts}    Optional parameters.
-                  • on_input: lua callback for input sent, i e keypresses in
+                  • on_input: Lua callback for input sent, i e keypresses in
                     terminal mode. Note: keypresses are sent raw as they would
                     be to the pty master end. For instance, a carriage return
                     is sent as a "\r", not as a "\n". |textlock| applies. It
@@ -1556,22 +1556,22 @@ Vimscript Functions                                            *api-vimscript*
 
                                                    *nvim_call_dict_function()*
 nvim_call_dict_function({dict}, {fn}, {args})
-    Calls a VimL |Dictionary-function| with the given arguments.
+    Calls a Vimscript |Dictionary-function| with the given arguments.
 
-    On execution error: fails with VimL error, updates v:errmsg.
+    On execution error: fails with Vimscript error, updates v:errmsg.
 
     Parameters: ~
-      • {dict}  Dictionary, or String evaluating to a VimL |self| dict
-      • {fn}    Name of the function defined on the VimL dict
+      • {dict}  Dictionary, or String evaluating to a Vimscript |self| dict
+      • {fn}    Name of the function defined on the Vimscript dict
       • {args}  Function arguments packed in an Array
 
     Return: ~
         Result of the function call
 
 nvim_call_function({fn}, {args})                        *nvim_call_function()*
-    Calls a VimL function with the given arguments.
+    Calls a Vimscript function with the given arguments.
 
-    On execution error: fails with VimL error, updates v:errmsg.
+    On execution error: fails with Vimscript error, updates v:errmsg.
 
     Parameters: ~
       • {fn}    Function to call
@@ -1583,7 +1583,7 @@ nvim_call_function({fn}, {args})                        *nvim_call_function()*
 nvim_command({command})                                       *nvim_command()*
     Executes an Ex command.
 
-    On execution error: fails with VimL error, updates v:errmsg.
+    On execution error: fails with Vimscript error, updates v:errmsg.
 
     Prefer using |nvim_cmd()| or |nvim_exec2()| over this. To evaluate
     multiple lines of Vim script or an Ex command directly, use
@@ -1595,13 +1595,13 @@ nvim_command({command})                                       *nvim_command()*
       • {command}  Ex command string
 
 nvim_eval({expr})                                                *nvim_eval()*
-    Evaluates a VimL |expression|. Dictionaries and Lists are recursively
+    Evaluates a Vimscript |expression|. Dictionaries and Lists are recursively
     expanded.
 
-    On execution error: fails with VimL error, updates v:errmsg.
+    On execution error: fails with Vimscript error, updates v:errmsg.
 
     Parameters: ~
-      • {expr}  VimL expression string
+      • {expr}  Vimscript expression string
 
     Return: ~
         Evaluation result or expanded object
@@ -1613,7 +1613,7 @@ nvim_exec2({src}, {*opts})                                      *nvim_exec2()*
     Unlike |nvim_command()| this function supports heredocs, script-scope
     (s:), etc.
 
-    On execution error: fails with VimL error, updates v:errmsg.
+    On execution error: fails with Vimscript error, updates v:errmsg.
 
     Parameters: ~
       • {src}   Vimscript code
@@ -1632,7 +1632,7 @@ nvim_exec2({src}, {*opts})                                      *nvim_exec2()*
 
                                                      *nvim_parse_expression()*
 nvim_parse_expression({expr}, {flags}, {highlight})
-    Parse a VimL expression.
+    Parse a Vimscript expression.
 
     Attributes: ~
         |api-fast|
@@ -1760,7 +1760,7 @@ nvim_cmd({*cmd}, {*opts})                                         *nvim_cmd()*
     example, instead of `vim.cmd.bdelete{ count = 2 }`, you may do
     `vim.cmd.bdelete(2)`.
 
-    On execution error: fails with VimL error, updates v:errmsg.
+    On execution error: fails with Vimscript error, updates v:errmsg.
 
     Parameters: ~
       • {cmd}   Command to execute. Must be a Dictionary that can contain the
@@ -2055,7 +2055,7 @@ nvim_buf_attach({buffer}, {send_buffer}, {opts})           *nvim_buf_attach()*
                          • deleted_codepoints (if `utf_sizes` is true)
                          • deleted_codeunits (if `utf_sizes` is true)
 
-                       • on_bytes: lua callback invoked on change. This
+                       • on_bytes: Lua callback invoked on change. This
                          callback receives more granular information about the
                          change compared to on_lines. Return `true` to detach. Args:
                          • the string "bytes"
@@ -2118,12 +2118,12 @@ nvim_buf_call({buffer}, {fun})                               *nvim_buf_call()*
 
     Parameters: ~
       • {buffer}  Buffer handle, or 0 for current buffer
-      • {fun}     Function to call inside the buffer (currently lua callable
+      • {fun}     Function to call inside the buffer (currently Lua callable
                   only)
 
     Return: ~
-        Return value of function. NB: will deepcopy lua values currently, use
-        upvalues to send lua references in and out.
+        Return value of function. NB: will deepcopy Lua values currently, use
+        upvalues to send Lua references in and out.
 
 nvim_buf_del_keymap({buffer}, {mode}, {lhs})           *nvim_buf_del_keymap()*
     Unmaps a buffer-local |mapping| for the given mode.
@@ -2720,7 +2720,7 @@ nvim_get_namespaces()                                  *nvim_get_namespaces()*
 nvim_set_decoration_provider({ns_id}, {*opts})
     Set or change decoration provider for a |namespace|
 
-    This is a very general purpose interface for having lua callbacks being
+    This is a very general purpose interface for having Lua callbacks being
     triggered during the redraw code.
 
     The expected usage is to set |extmarks| for the currently redrawn buffer.
@@ -2776,12 +2776,12 @@ nvim_win_call({window}, {fun})                               *nvim_win_call()*
 
     Parameters: ~
       • {window}  Window handle, or 0 for current window
-      • {fun}     Function to call inside the window (currently lua callable
+      • {fun}     Function to call inside the window (currently Lua callable
                   only)
 
     Return: ~
-        Return value of function. NB: will deepcopy lua values currently, use
-        upvalues to send lua references in and out.
+        Return value of function. NB: will deepcopy Lua values currently, use
+        upvalues to send Lua references in and out.
 
     See also: ~
       • |win_execute()|
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index f1c4782d1b..1989475164 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -5703,7 +5703,7 @@ mode([expr])	Return a string that indicates the current mode.
 			DoFull()->mode()
 
 msgpackdump({list} [, {type}])				*msgpackdump()*
-		Convert a list of VimL objects to msgpack. Returned value is a
+		Convert a list of Vimscript objects to msgpack. Returned value is a
 		|readfile()|-style list. When {type} contains "B", a |Blob| is
 		returned instead. Example: >
 			call writefile(msgpackdump([{}]), 'fname.mpack', 'b')
@@ -5723,7 +5723,7 @@ msgpackdump({list} [, {type}])				*msgpackdump()*
 
 msgpackparse({data})					*msgpackparse()*
 		Convert a |readfile()|-style list or a |Blob| to a list of
-		VimL objects.
+		Vimscript objects.
 		Example: >
 			let fname = expand('~/.config/nvim/shada/main.shada')
 			let mpack = readfile(fname, 'b')
diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt
index be4068d8c8..db878ac304 100644
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -99,8 +99,8 @@ Examples:
    scripting is performed by an external host process implemented in ~2k lines
    of Python.
 
-The provider framework invokes VimL from C.  It is composed of two functions
-in eval.c:
+The provider framework invokes Vimscript from C.  It is composed of two
+functions in eval.c:
 
 - eval_call_provider(name, method, arguments, discard): calls
   provider#{name}#Call with the method and arguments. If discard is true, any
@@ -429,7 +429,7 @@ Examples of API-client package names:
 - GOOD: nvim-racket
 - GOOD: pynvim
 - BAD:  python-client
-- BAD:  neovim
+- BAD:  neovim_
 
 API client implementation guidelines ~
 
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index 79894f7c73..d75820732f 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -619,7 +619,7 @@ To use Nvim as a manpager: >
      export MANPAGER='nvim +Man!'
 
 Note that when running `man` from the shell and with that `MANPAGER` in your
-environment, `man` will pre-format the manpage using `groff`. Thus, Neovim
+environment, `man` will pre-format the manpage using `groff`. Thus, Nvim
 will inevitably display the manual page as it was passed to it from stdin. One
 of the caveats of this is that the width will _always_ be hard-wrapped and not
 soft wrapped as with `g:man_hardwrap=0`. You can set in your environment: >
diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt
index aefaa0b7df..651dce08bf 100644
--- a/runtime/doc/help.txt
+++ b/runtime/doc/help.txt
@@ -100,7 +100,7 @@ ADVANCED EDITING
 ------------------------------------------------------------------------------
 API (EXTENSIBILITY/SCRIPTING/PLUGINS)
 
-|api|			Nvim API via RPC, Lua and VimL
+|api|			Nvim API via RPC, Lua and Vimscript
 |ui|			Nvim UI protocol
 |lua-guide|		Nvim Lua guide
 |lua|			Lua API
diff --git a/runtime/doc/if_perl.txt b/runtime/doc/if_perl.txt
index c3b49dc5bb..1fa96e2657 100644
--- a/runtime/doc/if_perl.txt
+++ b/runtime/doc/if_perl.txt
@@ -108,7 +108,7 @@ to the next.
 ==============================================================================
 2. The VIM module					*perl-vim*
 
-Perl code gets all of its access to Neovim via the "VIM" module.
+Perl code gets all of its access to Nvim via the "VIM" module.
 
 Overview >
 	print "Hello"				# displays a message
diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt
index a96c9fcc0a..5acc5c0e59 100644
--- a/runtime/doc/if_pyth.txt
+++ b/runtime/doc/if_pyth.txt
@@ -575,8 +575,8 @@ Python 3						*python3*
 
 As Python 3 is the only supported version in Nvim, "python" is synonymous
 with "python3" in the current version. However, code that aims to support older
-versions of Neovim, as well as Vim, should prefer to use "python3"
-variants explicitly if Python 3 is required.
+versions of Nvim, as well as Vim, should prefer to use "python3" variants
+explicitly if Python 3 is required.
 
 							*:py3* *:python3*
 :[range]py3 {stmt}
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index 15fe3838b7..86f7832376 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -83,7 +83,7 @@ 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
 
diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 62b280e7f6..6d28b71cdd 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -989,8 +989,8 @@ start_client({config})                                *vim.lsp.start_client()*
                     if `capabilities.offsetEncoding` was sent to it. You can
                     only modify the `client.offset_encoding` here before any
                     notifications are sent. Most language servers expect to be
-                    sent client specified settings after initialization.
-                    Neovim does not make this assumption. A
+                    sent client specified settings after initialization. Nvim
+                    does not make this assumption. A
                     `workspace/didChangeConfiguration` notification should be
                     sent to the server during on_init.
                   • on_exit Callback (code, signal, client_id) invoked on
@@ -1191,8 +1191,7 @@ format({options})                                       *vim.lsp.buf.format()*
                    fields:
                    • formatting_options (table|nil): Can be used to specify
                      FormattingOptions. Some unspecified options will be
-                     automatically derived from the current Neovim options.
-                     See https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#formattingOptions
+                     automatically derived from the current Nvim options. See https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#formattingOptions
                    • timeout_ms (integer|nil, default 1000): Time in
                      milliseconds to block for formatting requests. No effect
                      if async=true
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 80ef2e358c..c3eaf1ae39 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -34,7 +34,7 @@ Nvim ever ships with Lua 5.4+, a Lua 5.1 compatibility shim will be provided
 so that old plugins continue to work transparently.
 
                                                                   *lua-luajit*
-Neovim is built with luajit on platforms which support it, which provides
+Nvim is built with luajit on platforms which support it, which provides
 extra functionality. Lua code in |init.lua| and plugins can assume its presence
 on installations on common platforms. For maximum compatibility with less
 common platforms, availability can be checked using the `jit` global variable: >lua
@@ -46,7 +46,7 @@ common platforms, availability can be checked using the `jit` global variable: >
 <
                                                                   *lua-bit*
 In particular, the luajit "bit" extension module is _always_ available.
-A fallback implementation is included when nvim is built with PUC lua 5.1,
+A fallback implementation is included when nvim is built with PUC Lua 5.1,
 and will be transparently used when `require("bit")` is invoked.
 
 ==============================================================================
@@ -549,7 +549,7 @@ Multithreading                                            *lua-loop-threading*
 
 Plugins can perform work in separate (os-level) threads using the threading
 APIs in luv, for instance `vim.uv.new_thread`. Note that every thread
-gets its own separate lua interpreter state, with no access to lua globals
+gets its own separate Lua interpreter state, with no access to Lua globals
 in the main thread. Neither can the state of the editor (buffers, windows,
 etc) be directly accessed from threads.
 
@@ -557,10 +557,10 @@ A subset of the `vim.*` API is available in threads. This includes:
 
 - `vim.uv` with a separate event loop per thread.
 - `vim.mpack` and `vim.json` (useful for serializing messages between threads)
-- `require` in threads can use lua packages from the global |package.path|
+- `require` in threads can use Lua packages from the global |package.path|
 - `print()` and `vim.inspect`
 - `vim.diff`
-- most utility functions in `vim.*` for working with pure lua values
+- most utility functions in `vim.*` for working with pure Lua values
   like `vim.split`, `vim.tbl_*`, `vim.list_*`, and so on.
 - `vim.is_thread()` returns true from a non-main thread.
 
@@ -624,7 +624,7 @@ vim.highlight.priorities                            *vim.highlight.priorities*
 ------------------------------------------------------------------------------
 VIM.REGEX                                                          *lua-regex*
 
-Vim regexes can be used directly from lua. Currently they only allow
+Vim regexes can be used directly from Lua. Currently they only allow
 matching within a single line.
 
 vim.regex({re})                                                  *vim.regex()*
@@ -933,8 +933,8 @@ vim.wait({time} [, {callback}, {interval}, {fast_only}])          *vim.wait()*
 
 vim.ui_attach({ns}, {options}, {callback})                *vim.ui_attach()*
     Attach to ui events, similar to |nvim_ui_attach()| but receive events
-    as lua callback. Can be used to implement screen elements like
-    popupmenu or message handling in lua.
+    as Lua callback. Can be used to implement screen elements like
+    popupmenu or message handling in Lua.
 
     {options} should be a dictionary-like table, where `ext_...` options should
     be set to true to receive events for the respective external element.
@@ -1262,7 +1262,7 @@ In any of the above examples, to replicate the behavior |:setlocal|, use
                                                                *vim.opt:get()*
 Option:get()
 
-    Returns a lua-representation of the option. Boolean, number and string
+    Returns a Lua-representation of the option. Boolean, number and string
     values will be returned in exactly the same fashion.
 
     For values that are comma-separated lists, an array will be returned with
@@ -1435,10 +1435,10 @@ keycode({str})                                                 *vim.keycode()*
       • |nvim_replace_termcodes()|
 
 lua_omnifunc({find_start}, {_})                           *vim.lua_omnifunc()*
-    Omnifunc for completing lua values from the runtime lua interpreter,
+    Omnifunc for completing Lua values from the runtime Lua interpreter,
     similar to the builtin completion for the `:lua` command.
 
-    Activate using `set omnifunc=v:lua.vim.lua_omnifunc` in a lua buffer.
+    Activate using `set omnifunc=v:lua.vim.lua_omnifunc` in a Lua buffer.
 
 notify({msg}, {level}, {opts})                                  *vim.notify()*
     Display a notification to the user.
@@ -2230,17 +2230,17 @@ Lua module: loader                                                *lua-loader*
 disable()                                               *vim.loader.disable()*
     Disables the experimental Lua module loader:
     • removes the loaders
-    • adds the default Neovim loader
+    • adds the default Nvim loader
 
 enable()                                                 *vim.loader.enable()*
     Enables the experimental Lua module loader:
     • overrides loadfile
-    • adds the lua loader using the byte-compilation cache
+    • adds the Lua loader using the byte-compilation cache
     • adds the libs loader
-    • removes the default Neovim loader
+    • removes the default Nvim loader
 
 find({modname}, {opts})                                    *vim.loader.find()*
-    Finds lua modules for the given module name.
+    Finds Lua modules for the given module name.
 
     Parameters: ~
       • {modname}  (string) Module name, or `"*"` to find the top-level
diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt
index dffdb5950f..03f614e841 100644
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@@ -327,7 +327,7 @@ You can switch the 'write' option on with ":set write".
 							*E25*  >
   Nvim does not have a built-in GUI
 
-Neovim does not have a built in GUI, so `:gvim` and `:gui` don't work.
+Nvim does not have a built in GUI, so `:gvim` and `:gui` don't work.
 
 							*E49*  >
   Invalid scroll size
diff --git a/runtime/doc/news-0.9.txt b/runtime/doc/news-0.9.txt
index c7624119e2..5546703dab 100644
--- a/runtime/doc/news-0.9.txt
+++ b/runtime/doc/news-0.9.txt
@@ -109,7 +109,7 @@ The following new APIs or features were added.
   (or the Vimscript equivalent) to their |config| file.
 
 • A new environment variable named NVIM_APPNAME enables configuring the
-  directories where Neovim should find its configuration and state files. See
+  directories where Nvim should find its configuration and state files. See
   `:help $NVIM_APPNAME` .
 
 • Added support for running Lua scripts from shell using |-l|. >
@@ -117,9 +117,9 @@ The following new APIs or features were added.
 <  Also works with stdin: >
       echo "print(42)" | nvim -l -
 
-• Added an omnifunc implementation for lua, |vim.lua_omnifunc()|
+• Added an omnifunc implementation for Lua, |vim.lua_omnifunc()|
 
-• Added a new experimental |lua-loader| that byte-compiles and caches lua files.
+• Added a new experimental |lua-loader| that byte-compiles and caches Lua files.
   To enable the new loader, add the following at the top of your |init.lua|: >lua
     vim.loader.enable()
 
@@ -223,7 +223,7 @@ The following changes to existing APIs or features add new behavior.
 • The `win_viewport` UI event now contains information about virtual lines,
   meaning that smooth scrolling can now be implemented more consistently.
 
-• The `:= {expr}` syntax can be used to evaluate a lua expression, as
+• The `:= {expr}` syntax can be used to evaluate a Lua expression, as
   a shorter form of `:lua ={expr}`. `:=` and `:[range]=` without argument
   are unchanged. However `:=#` and similar variants using |ex-flags|
   are no longer supported.
diff --git a/runtime/doc/provider.txt b/runtime/doc/provider.txt
index a476a56877..9e70ff8945 100644
--- a/runtime/doc/provider.txt
+++ b/runtime/doc/provider.txt
@@ -66,7 +66,7 @@ To disable Python 3 support: >vim
 PYTHON VIRTUALENVS ~
 						*python-virtualenv*
 If you plan to use per-project virtualenvs often, you should assign one
-virtualenv for Neovim and hard-code the interpreter path via
+virtualenv for Nvim and hard-code the interpreter path via
 |g:python3_host_prog| so that the "pynvim" package is not required
 for each virtualenv.
 
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 51cbf4c93d..28208f68d3 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -241,8 +241,8 @@ argument.
 
 							*-ll*
 -ll {script} [args]
-		Execute a lua script, similarly to |-l|, but the editor is not
-		initialized. This gives a lua environment similar to a worker
+		Execute a Lua script, similarly to |-l|, but the editor is not
+		initialized. This gives a Lua environment similar to a worker
 		thread. See |lua-loop-threading|.
 
 		Unlike `-l` no prior arguments are allowed.
@@ -918,7 +918,7 @@ Shada ("shared data") file			*shada* *shada-file*
 If you exit Vim and later start it again, you would normally lose a lot of
 information.  The ShaDa file can be used to remember that information, which
 enables you to continue where you left off.  Its name is the abbreviation of
-SHAred DAta because it is used for sharing data between Neovim sessions.
+SHAred DAta because it is used for sharing data between Nvim sessions.
 
 This is introduced in section |21.3| of the user manual.
 
@@ -1010,16 +1010,16 @@ MERGING							*shada-merging*
 
 When writing ShaDa files with |:wshada| without bang or at regular exit
 information in the existing ShaDa file is merged with information from current
-Neovim instance.  For this purpose ShaDa files store timestamps associated
+Nvim instance.  For this purpose ShaDa files store timestamps associated
 with ShaDa entries.  Specifically the following is being done:
 
 1. History lines are merged, ordered by timestamp.  Maximum amount of items in
    ShaDa file is defined by 'shada' option (|shada-/|, |shada-:|, |shada-@|,
    etc: one suboption for each character that represents history name
    (|:history|)).
-2. Local marks and changes for files that were not opened by Neovim are copied
-   to new ShaDa file. Marks for files that were opened by Neovim are merged,
-   changes to files opened by Neovim are ignored. |shada-'|
+2. Local marks and changes for files that were not opened by Nvim are copied
+   to new ShaDa file. Marks for files that were opened by Nvim are merged,
+   changes to files opened by Nvim are ignored. |shada-'|
 3. Jump list is merged: jumps are ordered by timestamp, identical jumps
    (identical position AND timestamp) are squashed.
 4. Search patterns and substitute strings are not merged: search pattern or
@@ -1027,14 +1027,14 @@ with ShaDa entries.  Specifically the following is being done:
    to ShaDa file.
 5. For each register entity with greatest timestamp is the only saved.
    |shada-<|
-6. All saved variables are saved from current Neovim instance. Additionally
+6. All saved variables are saved from current Nvim instance. Additionally
    existing variable values are copied, meaning that the only way to remove
    variable from a ShaDa file is either removing it by hand or disabling
    writing variables completely. |shada-!|
 7. For each global mark entity with greatest timestamp is the only saved.
 8. Buffer list and header are the only entries which are not merged in any
    fashion: the only header and buffer list present are the ones from the
-   Neovim instance which was last writing the file. |shada-%|
+   Nvim instance which was last writing the file. |shada-%|
 
 COMPATIBILITY						*shada-compatibility*
 
@@ -1059,13 +1059,13 @@ ShaDa files are forward and backward compatible.  This means that
    history types. |history|
 6. Unknown keys found in register, local mark, global mark, change, jump and
    search pattern entries are saved internally and dumped when writing.
-   Entries created during Neovim session never have such additions.
+   Entries created during Nvim session never have such additions.
 7. Additional elements found in replacement string and history entries are
-   saved internally and dumped. Entries created during Neovim session never
+   saved internally and dumped. Entries created during Nvim session never
    have such additions.
 8. Additional elements found in variable entries are simply ignored when
    reading. When writing new variables they will be preserved during merging,
-   but that's all. Variable values dumped from current Neovim session never
+   but that's all. Variable values dumped from current Nvim session never
    have additional elements, even if variables themselves were obtained by
    reading ShaDa files.
 
@@ -1102,7 +1102,7 @@ start with an existing one to get the format right.  You need to understand
 MessagePack (or, more likely, find software that is able to use it) format to
 do this.  This can be useful in order to create a second file, say
 "~/.my.shada" which could contain certain settings that you always want when
-you first start Neovim.  For example, you can preload registers with
+you first start Nvim.  For example, you can preload registers with
 particular data, or put certain commands in the command line history.  A line
 in your |config| file like >
 	:rshada! ~/.my.shada
@@ -1112,12 +1112,12 @@ file name, using the ":autocmd" command (see |:autocmd|).  More information on
 ShaDa file format is contained in |shada-format| section.
 
 					  *E136* *E929* *shada-error-handling*
-Some errors make Neovim leave temporary file named `{basename}.tmp.X` (X is
+Some errors make Nvim leave temporary file named `{basename}.tmp.X` (X is
 any free letter from `a` to `z`) while normally it will create this file,
 write to it and then rename `{basename}.tmp.X` to `{basename}`. Such errors
 include:
 
-- Errors which make Neovim think that read file is not a ShaDa file at all:
+- Errors which make Nvim think that read file is not a ShaDa file at all:
   non-ShaDa files are not overwritten for safety reasons to avoid accidentally
   destroying an unrelated file.  This could happen e.g. when typing "nvim -i
   file" in place of "nvim -R file" (yes, somebody did that at least with Vim).
@@ -1125,26 +1125,26 @@ include:
 - If writing to the temporary file failed: e.g. because of the insufficient
   space left.
 - If renaming file failed: e.g. because of insufficient permissions.
-- If target ShaDa file has different from the Neovim instance's owners (user
+- If target ShaDa file has different from the Nvim instance's owners (user
   and group) and changing them failed.  Unix-specific, applies only when
-  Neovim was launched from root.
+  Nvim was launched from root.
 
 Do not forget to remove the temporary file or replace the target file with
 temporary one after getting one of the above errors or all attempts to create
 a ShaDa file may fail with |E929|.  If you got one of them when using
-|:wshada| (and not when exiting Neovim: i.e. when you have Neovim session
+|:wshada| (and not when exiting Nvim: i.e. when you have Nvim session
 running) you have additional options:
 
 - First thing which you should consider if you got any error, except failure
   to write to the temporary file: remove existing file and replace it with the
-  temporary file.  Do it even if you have running Neovim instance.
+  temporary file.  Do it even if you have running Nvim instance.
 - Fix the permissions and/or file ownership, free some space and attempt to
   write again.  Do not remove the existing file.
 - Use |:wshada| with bang.  Does not help in case of permission error.  If
   target file was actually the ShaDa file some information may be lost in this
   case.  To make the matters slightly better use |:rshada| prior to writing,
   but this still will loose buffer-local marks and change list entries for any
-  file which is not opened in the current Neovim instance.
+  file which is not opened in the current Nvim instance.
 - Remove the target file from shell and use |:wshada|.  Consequences are not
   different from using |:wshada| with bang, but "rm -f" works in some cases
   when you don't have write permissions.
@@ -1211,7 +1211,7 @@ exactly four MessagePack objects:
                        Key        Data ~
                        generator  Binary, software used to generate ShaDa
                                   file. Is equal to "nvim" when ShaDa file was
-                                  written by Neovim.
+                                  written by Nvim.
                        version    Binary, generator version.
                        encoding   Binary, effective 'encoding' value.
                        max_kbyte  Integer, effective |shada-s| limit value.
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index f07fb0902e..89bdaa310e 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -459,7 +459,7 @@ Lua interface (|lua.txt|):
 - `:lua print("a\0b")` will print `a^@b`, like with `:echomsg "a\nb"` . In Vim
   that prints `a` and `b` on separate lines, exactly like
   `:lua print("a\nb")` .
-- `:lua error('TEST')` emits the error “E5105: Error while calling lua chunk:
+- `:lua error('TEST')` emits the error “E5105: Error while calling Lua chunk:
   [string "<VimL compiled string>"]:1: TEST”, whereas Vim emits only “TEST”.
 - Lua has direct access to Nvim |API| via `vim.api`.
 - Lua package.path and package.cpath are automatically updated according to