--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -4726,12 +4726,12 @@ E95	message.txt	/*E95*
 E950	message.txt	/*E950*
 E951	pattern.txt	/*E951*
 E952	autocmd.txt	/*E952*
-E953	eval.txt	/*E953*
+E953	terminal.txt	/*E953*
 E954	options.txt	/*E954*
-E955	eval.txt	/*E955*
+E955	terminal.txt	/*E955*
 E956	pattern.txt	/*E956*
 E957	eval.txt	/*E957*
-E958	eval.txt	/*E958*
+E958	terminal.txt	/*E958*
 E96	diff.txt	/*E96*
 E960	options.txt	/*E960*
 E961	cmdline.txt	/*E961*
@@ -4773,7 +4773,7 @@ E993	popup.txt	/*E993*
 E994	eval.txt	/*E994*
 E995	eval.txt	/*E995*
 E996	eval.txt	/*E996*
-E996	popup.txt	/*E996*
+E997	popup.txt	/*E997*
 E999	repeat.txt	/*E999*
 EX	intro.txt	/*EX*
 EXINIT	starting.txt	/*EXINIT*
@@ -5418,6 +5418,7 @@ break-finally	eval.txt	/*break-finally*
 browse()	eval.txt	/*browse()*
 browsedir()	eval.txt	/*browsedir()*
 browsefilter	editing.txt	/*browsefilter*
+bufadd()	eval.txt	/*bufadd()*
 bufexists()	eval.txt	/*bufexists()*
 buffer-functions	usr_41.txt	/*buffer-functions*
 buffer-hidden	windows.txt	/*buffer-hidden*
@@ -5430,6 +5431,7 @@ buffer_number()	eval.txt	/*buffer_number
 buffers	windows.txt	/*buffers*
 buffers-menu	gui.txt	/*buffers-menu*
 buflisted()	eval.txt	/*buflisted()*
+bufload()	eval.txt	/*bufload()*
 bufloaded()	eval.txt	/*bufloaded()*
 bufname()	eval.txt	/*bufname()*
 bufnr()	eval.txt	/*bufnr()*
@@ -8222,21 +8224,27 @@ popt-option	print.txt	/*popt-option*
 popup	popup.txt	/*popup*
 popup-buffer	popup.txt	/*popup-buffer*
 popup-callback	popup.txt	/*popup-callback*
+popup-close	popup.txt	/*popup-close*
 popup-examples	popup.txt	/*popup-examples*
 popup-filter	popup.txt	/*popup-filter*
+popup-function-details	popup.txt	/*popup-function-details*
 popup-functions	popup.txt	/*popup-functions*
 popup-intro	popup.txt	/*popup-intro*
+popup-mask	popup.txt	/*popup-mask*
 popup-menu	gui.txt	/*popup-menu*
 popup-menu-added	version5.txt	/*popup-menu-added*
 popup-position	popup.txt	/*popup-position*
 popup-props	popup.txt	/*popup-props*
+popup-scrollbar	popup.txt	/*popup-scrollbar*
+popup-usage	popup.txt	/*popup-usage*
 popup-window	popup.txt	/*popup-window*
+popup-window-functions	usr_41.txt	/*popup-window-functions*
 popup.txt	popup.txt	/*popup.txt*
 popup_atcursor()	popup.txt	/*popup_atcursor()*
 popup_clear()	popup.txt	/*popup_clear()*
 popup_close()	popup.txt	/*popup_close()*
 popup_create()	popup.txt	/*popup_create()*
-popup_create-usage	popup.txt	/*popup_create-usage*
+popup_create-arguments	popup.txt	/*popup_create-arguments*
 popup_dialog()	popup.txt	/*popup_dialog()*
 popup_dialog-example	popup.txt	/*popup_dialog-example*
 popup_filter_menu()	popup.txt	/*popup_filter_menu()*
@@ -9262,29 +9270,29 @@ term++open	terminal.txt	/*term++open*
 term-dependent-settings	term.txt	/*term-dependent-settings*
 term-list	syntax.txt	/*term-list*
 term.txt	term.txt	/*term.txt*
-term_dumpdiff()	eval.txt	/*term_dumpdiff()*
-term_dumpload()	eval.txt	/*term_dumpload()*
-term_dumpwrite()	eval.txt	/*term_dumpwrite()*
-term_getaltscreen()	eval.txt	/*term_getaltscreen()*
-term_getansicolors()	eval.txt	/*term_getansicolors()*
-term_getattr()	eval.txt	/*term_getattr()*
-term_getcursor()	eval.txt	/*term_getcursor()*
-term_getjob()	eval.txt	/*term_getjob()*
-term_getline()	eval.txt	/*term_getline()*
-term_getscrolled()	eval.txt	/*term_getscrolled()*
-term_getsize()	eval.txt	/*term_getsize()*
-term_getstatus()	eval.txt	/*term_getstatus()*
-term_gettitle()	eval.txt	/*term_gettitle()*
-term_gettty()	eval.txt	/*term_gettty()*
-term_list()	eval.txt	/*term_list()*
-term_scrape()	eval.txt	/*term_scrape()*
-term_sendkeys()	eval.txt	/*term_sendkeys()*
-term_setansicolors()	eval.txt	/*term_setansicolors()*
-term_setkill()	eval.txt	/*term_setkill()*
-term_setrestore()	eval.txt	/*term_setrestore()*
-term_setsize()	eval.txt	/*term_setsize()*
-term_start()	eval.txt	/*term_start()*
-term_wait()	eval.txt	/*term_wait()*
+term_dumpdiff()	terminal.txt	/*term_dumpdiff()*
+term_dumpload()	terminal.txt	/*term_dumpload()*
+term_dumpwrite()	terminal.txt	/*term_dumpwrite()*
+term_getaltscreen()	terminal.txt	/*term_getaltscreen()*
+term_getansicolors()	terminal.txt	/*term_getansicolors()*
+term_getattr()	terminal.txt	/*term_getattr()*
+term_getcursor()	terminal.txt	/*term_getcursor()*
+term_getjob()	terminal.txt	/*term_getjob()*
+term_getline()	terminal.txt	/*term_getline()*
+term_getscrolled()	terminal.txt	/*term_getscrolled()*
+term_getsize()	terminal.txt	/*term_getsize()*
+term_getstatus()	terminal.txt	/*term_getstatus()*
+term_gettitle()	terminal.txt	/*term_gettitle()*
+term_gettty()	terminal.txt	/*term_gettty()*
+term_list()	terminal.txt	/*term_list()*
+term_scrape()	terminal.txt	/*term_scrape()*
+term_sendkeys()	terminal.txt	/*term_sendkeys()*
+term_setansicolors()	terminal.txt	/*term_setansicolors()*
+term_setkill()	terminal.txt	/*term_setkill()*
+term_setrestore()	terminal.txt	/*term_setrestore()*
+term_setsize()	terminal.txt	/*term_setsize()*
+term_start()	terminal.txt	/*term_start()*
+term_wait()	terminal.txt	/*term_wait()*
 termcap	term.txt	/*termcap*
 termcap-changed	version4.txt	/*termcap-changed*
 termcap-colors	term.txt	/*termcap-colors*
@@ -9315,6 +9323,7 @@ terminal-debugger	terminal.txt	/*termina
 terminal-diff	terminal.txt	/*terminal-diff*
 terminal-diffscreendump	terminal.txt	/*terminal-diffscreendump*
 terminal-dumptest	terminal.txt	/*terminal-dumptest*
+terminal-function-details	terminal.txt	/*terminal-function-details*
 terminal-functions	usr_41.txt	/*terminal-functions*
 terminal-info	term.txt	/*terminal-info*
 terminal-job-index	index.txt	/*terminal-job-index*