diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 3105a3d..8c79f56 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -1,4 +1,4 @@
-*builtin.txt*	For Vim version 9.1.  Last change: 2025 Jun 02
+*builtin.txt*	For Vim version 9.1.  Last change: 2025 Jun 07
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -2047,8 +2047,8 @@
 		  or empty string if no match was found or when using the
 		  default 'iskeyword' pattern.
 
-		When 'isexpand' is empty, uses the 'iskeyword' pattern
-		"\k\+$" to find the start of the current keyword.
+		When 'isexpand' is empty, uses the 'iskeyword' pattern "\k\+$"
+		to find the start of the current keyword.
 
 		Examples: >
 	set isexpand=.,->,/,/*,abc
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index bb91558..70fe4ca 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 9.1.  Last change: 2025 Jun 05
+*options.txt*	For Vim version 9.1.  Last change: 2025 Jun 07
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -7704,7 +7704,6 @@
 						*'showtabpanel'* *'stpl'*
 'showtabpanel' 'stpl'	number	(default 0)
 			global
-			{not in Vi}
 			{not available when compiled without the |+tabpanel|
 			feature}
 	The value of this option specifies when the |tabpanel| with tab page
@@ -7712,7 +7711,6 @@
 		0: never
 		1: only if there are at least two tab pages
 		2: always
-	This is for the non-GUI implementation of the tabpanel only.
 	See |tab-page| for more information about tab page labels.
 
 						*'sidescroll'* *'ss'*
@@ -8430,9 +8428,8 @@
 	argument or the ":tab all" command. |tabpage|
 
 				*'tabpanel'* *'tpl'* *g:actual_curtabpage*
-'tabpanel' 'tpl'			string	(default empty)
+'tabpanel' 'tpl'	string	(default empty)
 			global
-			{not in Vi}
 	When non-empty, this option determines the content of the |tabpanel|.
 	The option consists of printf style '%' items interspersed with
 	normal text, similar to the 'statusline' or 'tabline'.
@@ -8443,12 +8440,12 @@
 
 	You can use |g:actual_curtabpage| within a function assigned to
 	tabpanel. |g:actual_curtabpage| represents current tab's label number.
-	This option can contain line breaks:
->
-	set tabpanel=%!TabPanel()
-	function! TabPanel() abort
-	  return printf("(%2d)\n  %%f", g:actual_curtabpage)
-	endfunction
+	The option value can contain line breaks: >
+
+		set tabpanel=%!TabPanel()
+		function! TabPanel() abort
+		  return printf("(%2d)\n  %%f", g:actual_curtabpage)
+		endfunction
 <
 	The result is:
 >
@@ -8461,30 +8458,28 @@
 	|           |
 	|           |
 <
-
 					*'tabpanelopt'* *'tplo'*
-'tabpanelopt' 'tplo'		string	(default "")
+'tabpanelopt' 'tplo'	string	(default "")
 			global
-			{not in Vi}
 	Optional settings for the |tabpanel|,  It can consist of the following
 	items.  Items must be separated by a comma.
 
 		align:{text}	Specifies the position of the tabpanel.
 				Currently supported positions are:
 
-				left	left-aligned
-				right	right-aligned
+				left	left-side
+				right	right-side
 
 				(default "left")
 
-		columns:{n}	Use the size (in characters) of the tabpanel.
-				The tabpanel is never shown when using zero
-				or less than the size of Vim window.
+		columns:{n}	Number of columns of the tabpanel.
+				If this value is 0 or less than 'columns', the
+				tab panel will not be displayed.
 				(default 20)
 
 		vert		Use a vertical separator for tabpanel.
-				This vertical separator used is "tpl_vert" of
-				'fillchars'.
+				The vertical separator character is taken from
+				"tpl_vert" in 'fillchars'.
 				(default off)
 
 	Examples: >
@@ -8493,16 +8488,15 @@
 		:set tabpanelopt=vert,align:right
 		:set tabpanelopt=columns:16
 <
-
 						*'tabstop'* *'ts'*
 'tabstop' 'ts'		number	(default 8)
 			local to buffer
 	Defines the column multiple used to display the Horizontal Tab
-	character (ASCII 9); a Horizontal Tab always advances to the next
-	tab stop.
+	character (ASCII 9); a Horizontal Tab always advances to the next tab
+	stop.
 	The value must be at least 1 and at most 9999.
-	If Vim was compiled with |+vartabs| and |'vartabstop'| is set, this option
-	is ignored.
+	If Vim was compiled with |+vartabs| and |'vartabstop'| is set, this
+	option is ignored.
 	Leave it at 8 unless you have a strong reason (see usr |30.5|).
 
 
diff --git a/runtime/doc/tabpage.txt b/runtime/doc/tabpage.txt
index e301098..2be0a91 100644
--- a/runtime/doc/tabpage.txt
+++ b/runtime/doc/tabpage.txt
@@ -1,4 +1,4 @@
-*tabpage.txt*   For Vim version 9.1.  Last change: 2025 May 30
+*tabpage.txt*   For Vim version 9.1.  Last change: 2025 Jun 07
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -441,7 +441,8 @@
 The 'tabpanel' and 'showtabpanel' options function similar to
 'statusline' or 'tabline'.
 
-The "columns:" of 'tabpanelopt' option specifies the width of the tabpanel:
+The "columns:" item of 'tabpanelopt' option specifies the width of the
+tabpanel:
 >
               +------ This width
               |
@@ -451,26 +452,17 @@
 	|  ~/aaa.txt|text text text text text text text
 	|(2)        |text text text text text text text
 <
-The "align:" of 'tabpanelopt' option determines whether the tabpanel is
-displayed on the right side of the window:
+The "align:" item of the 'tabpanelopt' option determines whether the tabpanel
+will be displayed on the left or right side of the window:
 >
 	+----------------------------------+-----------
 	|text text text text text text text|(1)
 	|text text text text text text text|  ~/aaa.txt
 	|text text text text text text text|(2)
 <
-The "wrap" of 'tabpanelopt' option controls whether lines in tabpanel are
-wraped:
->
-	+-----------+----------------------------------
-	|(1)        |text text text text text text text
-	|  ~/long_lo|text text text text text text text
-	|ng_file_nam|text text text text text text text
-	|e.txt      |text text text text text text text
-	|(2)        |text text text text text text text
-
-The "vert" of 'tabpanelopt' option defines whether a vertical separator is
-displayed between the tabpanel and the main window:
+The "vert" item of the 'tabpanelopt' option specifies whether a vertical
+separator should be displayed between the tabpanel and the display part of the
+window:
 >
                     +------ This is
                     |
@@ -480,7 +472,7 @@
 	|  ~/aaa.txt|text text text text text text text
 	|(2)        |text text text text text text text
 <
-The vertical separator used is "tpl_vert" of 'fillchars'.
+The vertical separator character is taken from "tpl_vert" in 'fillchars'.
 
 You can customize the appearance of the tab page labels using the highlight
 groups: |hl-TabPanel| |hl-TabPanelSel| |hl-TabPanelFill|
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 8416a17..f6c0ae9 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -1,4 +1,4 @@
-*various.txt*   For Vim version 9.1.  Last change: 2025 May 15
+*various.txt*   For Vim version 9.1.  Last change: 2025 Jun 07
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -41,7 +41,6 @@
 			when 'tabpanel' includes an item that doesn't trigger
 			automatic updating.
 
-
 							*N<Del>*
 <Del>			When entering a number: Remove the last digit.
 			Note: if you like to use <BS> for this, add this