--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -943,7 +943,7 @@
 'wfh'	options.txt	/*'wfh'*
 'wh'	options.txt	/*'wh'*
 'whichwrap'	options.txt	/*'whichwrap'*
-'wi'	vi_diff.txt	/*'wi'*
+'wi'	options.txt	/*'wi'*
 'wig'	options.txt	/*'wig'*
 'wildchar'	options.txt	/*'wildchar'*
 'wildcharm'	options.txt	/*'wildcharm'*
@@ -953,7 +953,7 @@
 'wildoptions'	options.txt	/*'wildoptions'*
 'wim'	options.txt	/*'wim'*
 'winaltkeys'	options.txt	/*'winaltkeys'*
-'window'	vi_diff.txt	/*'window'*
+'window'	options.txt	/*'window'*
 'winfixheight'	options.txt	/*'winfixheight'*
 'winheight'	options.txt	/*'winheight'*
 'winminheight'	options.txt	/*'winminheight'*
@@ -4379,17 +4379,21 @@ count-variable	eval.txt	/*count-variable
 count1-variable	eval.txt	/*count1-variable*
 cp-default	version5.txt	/*cp-default*
 cpo-!	options.txt	/*cpo-!*
+cpo-#	options.txt	/*cpo-#*
 cpo-$	options.txt	/*cpo-$*
 cpo-%	options.txt	/*cpo-%*
+cpo-&	options.txt	/*cpo-&*
 cpo-+	options.txt	/*cpo-+*
 cpo--	options.txt	/*cpo--*
 cpo-<	options.txt	/*cpo-<*
+cpo->	options.txt	/*cpo->*
 cpo-A	options.txt	/*cpo-A*
 cpo-B	options.txt	/*cpo-B*
 cpo-C	options.txt	/*cpo-C*
 cpo-D	options.txt	/*cpo-D*
 cpo-E	options.txt	/*cpo-E*
 cpo-F	options.txt	/*cpo-F*
+cpo-H	options.txt	/*cpo-H*
 cpo-I	options.txt	/*cpo-I*
 cpo-J	options.txt	/*cpo-J*
 cpo-K	options.txt	/*cpo-K*
@@ -4399,8 +4403,10 @@ cpo-O	options.txt	/*cpo-O*
 cpo-R	options.txt	/*cpo-R*
 cpo-S	options.txt	/*cpo-S*
 cpo-W	options.txt	/*cpo-W*
+cpo-X	options.txt	/*cpo-X*
 cpo-a	options.txt	/*cpo-a*
 cpo-b	options.txt	/*cpo-b*
+cpo-bar	options.txt	/*cpo-bar*
 cpo-c	options.txt	/*cpo-c*
 cpo-d	options.txt	/*cpo-d*
 cpo-e	options.txt	/*cpo-e*
@@ -4414,14 +4420,17 @@ cpo-m	options.txt	/*cpo-m*
 cpo-n	options.txt	/*cpo-n*
 cpo-o	options.txt	/*cpo-o*
 cpo-p	options.txt	/*cpo-p*
+cpo-q	options.txt	/*cpo-q*
 cpo-r	options.txt	/*cpo-r*
 cpo-s	options.txt	/*cpo-s*
+cpo-star	options.txt	/*cpo-star*
 cpo-t	options.txt	/*cpo-t*
 cpo-u	options.txt	/*cpo-u*
 cpo-v	options.txt	/*cpo-v*
 cpo-w	options.txt	/*cpo-w*
 cpo-x	options.txt	/*cpo-x*
 cpo-y	options.txt	/*cpo-y*
+cpo-{	options.txt	/*cpo-{*
 crash-recovery	recover.txt	/*crash-recovery*
 creating-menus	gui.txt	/*creating-menus*
 credits	intro.txt	/*credits*
@@ -5693,6 +5702,7 @@ new-options-5.2	version5.txt	/*new-optio
 new-options-5.4	version5.txt	/*new-options-5.4*
 new-perl-python	version5.txt	/*new-perl-python*
 new-plugins	version6.txt	/*new-plugins*
+new-posix	version7.txt	/*new-posix*
 new-print-multi-byte	version7.txt	/*new-print-multi-byte*
 new-printing	version6.txt	/*new-printing*
 new-runtime-dir	version5.txt	/*new-runtime-dir*
@@ -5837,6 +5847,7 @@ popup-menu	gui.txt	/*popup-menu*
 popup-menu-added	version5.txt	/*popup-menu-added*
 ports-5.2	version5.txt	/*ports-5.2*
 ports-6	version6.txt	/*ports-6*
+posix	vi_diff.txt	/*posix*
 posix-compliance	vi_diff.txt	/*posix-compliance*
 posix-screen-size	vi_diff.txt	/*posix-screen-size*
 postscr-syntax	syntax.txt	/*postscr-syntax*