diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index d75820732f..bd74f45091 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -668,9 +668,8 @@ QUERY					                *ft-query-plugin*
 
 
 Linting of tree-sitter queries for installed parsers using
-|lua-treesitter-query_linter| is enabled by default on
-`BufEnter` and `BufWrite`. To change the events that
-trigger linting, use >lua
+|vim.treesitter.query.lint()| is enabled by default on `BufEnter` and
+`BufWrite`. To change the events that trigger linting, use >lua
 
 	vim.g.query_lint_on = { 'InsertLeave', 'TextChanged' }
 <
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index 106219693a..b0ead51d0c 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1110,7 +1110,7 @@ to terminal mode.
 You found it, Arthur!				*holy-grail*
 
 ==============================================================================
-6. EX commands				*ex-commands* *ex-cmd-index* *:index*
+6. EX commands				*Ex-commands* *ex-cmd-index* *:index*
 
 This is a brief but complete listing of all the ":" commands, without
 mentioning any arguments.  The optional part of the command name is inside [].
diff --git a/runtime/doc/lua-guide.txt b/runtime/doc/lua-guide.txt
index af7f22304d..b138de85c9 100644
--- a/runtime/doc/lua-guide.txt
+++ b/runtime/doc/lua-guide.txt
@@ -30,7 +30,7 @@ The purpose of this guide is to introduce the different ways of interacting
 with Nvim through Lua (the "API"). This API consists of three different
 layers:
 
-1. The "Vim API" inherited from Vim: |ex-commands| and |builtin-functions| as
+1. The "Vim API" inherited from Vim: |Ex-commands| and |builtin-functions| as
 well as |user-function|s in Vimscript. These are accessed through |vim.cmd()|
 and |vim.fn| respectively, which are discussed under |lua-guide-vimscript|
 below.
@@ -80,7 +80,7 @@ exactly like for a Vimscript file:
     :source ~/programs/baz/myluafile.lua
 <
 Finally, you can include Lua code in a Vimscript file by putting it inside a
-|lua-heredoc| block:
+|:lua-heredoc| block:
 >vim
     lua << EOF
       local tbl = {1, 2, 3}
@@ -199,8 +199,8 @@ this allows you to pass multiple commands to a single call of |vim.cmd()|:
       highlight link Warning Error
     ]])
 <
-This is the converse of |lua-heredoc| and allows you to include Vimscript code in
-your `init.lua`.
+This is the converse of |:lua-heredoc| and allows you to include Vimscript
+code in your `init.lua`.
 
 If you want to build your Vim command programmatically, the following form can
 be useful (all these are equivalent to the corresponding line above):
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 822ce4e85a..fb6cbca6e3 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -252,7 +252,7 @@ arguments separated by " " (space) instead of "\t" (tab).
 {endmarker}
     Executes Lua script {script} from within Vimscript. You can omit
     [endmarker] after the "<<" and use a dot "." after {script} (similar to
-    |:append|, |:insert|). Refer to |let-heredoc| for more information.
+    |:append|, |:insert|). Refer to |:let-heredoc| for more information.
 
     Example: >vim
         function! CurrentLineInfo()
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index b5d0f6a6b7..da634966f9 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4444,7 +4444,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 				*'packpath'* *'pp'*
 'packpath' 'pp'		string	(default: see 'runtimepath')
-	Directories used to find packages.  See |packages| and |rtp-packages|.
+	Directories used to find packages.
+	See |packages| and |packages-runtimepath|.
 
 
 						*'paragraphs'* *'para'*
diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt
index 276041caac..dfe9032506 100644
--- a/runtime/doc/pi_netrw.txt
+++ b/runtime/doc/pi_netrw.txt
@@ -91,7 +91,6 @@ Copyright: Copyright (C) 2017 Charles E Campbell    *netrw-copyright*
       Marked Files: Grep..................................|netrw-mg|
       Marked Files: Hiding and Unhiding by Suffix.........|netrw-mh|
       Marked Files: Moving................................|netrw-mm|
-      Marked Files: Printing..............................|netrw-mp|
       Marked Files: Sourcing..............................|netrw-ms|
       Marked Files: Setting the Target Directory..........|netrw-mt|
       Marked Files: Tagging...............................|netrw-mT|
@@ -1108,7 +1107,6 @@ QUICK REFERENCE: MAPS				*netrw-browse-maps* {{{2
 	   mg	Apply vimgrep to marked files                        |netrw-mg|
 	   mh	Toggle marked file suffices' presence on hiding list |netrw-mh|
 	   mm	Move marked files to marked-file target directory    |netrw-mm|
-	   mp	Print marked files                                   |netrw-mp|
 	   mr	Mark files using a shell-style |regexp|                |netrw-mr|
 	   mt	Current browsing directory becomes markfile target   |netrw-mt|
 	   mT	Apply ctags to marked files                          |netrw-mT|
@@ -2154,7 +2152,6 @@ The following netrw maps make use of marked files:
     |netrw-mF|	Unmark marked files
     |netrw-mg|	Apply vimgrep to marked files
     |netrw-mm|	Move marked files to target
-    |netrw-mp|	Print marked files
     |netrw-ms|	Netrw will source marked files
     |netrw-mt|	Set target for |netrw-mm| and |netrw-mc|
     |netrw-mT|	Generate tags using marked files
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index 9075d60b1b..243e8579e0 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1333,7 +1333,7 @@ is a List with arguments.
 Function references are most useful in combination with a Dictionary, as is
 explained in the next section.
 
-More information about defining your own functions here: |user-functions|.
+More information about defining your own functions here: |user-function|.
 
 ==============================================================================
 *41.8*	Lists and Dictionaries
diff --git a/scripts/gen_help_html.lua b/scripts/gen_help_html.lua
index f741efcaeb..7f84a4d54d 100644
--- a/scripts/gen_help_html.lua
+++ b/scripts/gen_help_html.lua
@@ -293,7 +293,7 @@ local function ignore_invalid(s)
     -- Strings like |~/====| appear in various places and the parser thinks they are links, but they
     -- are just table borders.
     or s:find('===')
-    or s:find('---')
+    or s:find('%-%-%-')
   )
 end