diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 5928929..c1dea37 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -4101,8 +4101,9 @@
 				yet (see |import-autoload|).
 		    name	vim script file name.
 		    sid		script ID |<SID>|.
-		    sourced	if this script is an alias this is the script
-				ID of the actually sourced script, otherwise zero
+		    sourced	script ID of the actually sourced script that
+				this script name links to, if any, otherwise
+				zero
 
 gettabinfo([{tabnr}])					*gettabinfo()*
 		If {tabnr} is not specified, then information about all the
@@ -7440,8 +7441,10 @@
 		starts in column zero and then matches before the cursor are
 		skipped.  When the 'c' flag is present in 'cpo' the next
 		search starts after the match.  Without the 'c' flag the next
-		search starts one column further.  This matters for
-		overlapping matches.
+		search starts one column after the start of the match.  This
+		matters for overlapping matches.  See |cpo-c|.  You can also
+		insert "\ze" to change where the match ends, see  |/\ze|.
+
 		When searching backwards and the 'z' flag is given then the
 		search starts in column zero, thus no match in the current
 		line will be found (unless wrapping around the end of the
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index ade9e42..2ebbadb 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -983,25 +983,38 @@
 PYTHON							*ft-python-indent*
 
 The amount of indent can be set for the following situations.  The examples
-given are the defaults.  Note that the variables are set to an expression, so
-that you can change the value of 'shiftwidth' later.
+given are the defaults.  Note that the dictionary values are set to an
+expression, so that you can change the value of 'shiftwidth' later.
 
 Indent after an open paren: >
-	let g:pyindent_open_paren = 'shiftwidth() * 2'
+	let g:python_indent.open_paren = 'shiftwidth() * 2'
 Indent after a nested paren: >
-	let g:pyindent_nested_paren = 'shiftwidth()'
+	let g:python_indent.nested_paren = 'shiftwidth()'
 Indent for a continuation line: >
-	let g:pyindent_continue = 'shiftwidth() * 2'
+	let g:python_indent.continue = 'shiftwidth() * 2'
+
+By default, the closing paren on a multiline construct lines up under the first
+non-whitespace character of the previous line.
+If you prefer that it's lined up under the first character of the line that
+starts the multiline construct, reset this key: >
+	let g:python_indent.closed_paren_align_last_line = v:false
 
 The method uses |searchpair()| to look back for unclosed parentheses.  This
 can sometimes be slow, thus it timeouts after 150 msec.  If you notice the
 indenting isn't correct, you can set a larger timeout in msec: >
-	let g:pyindent_searchpair_timeout = 500
+	let g:python_indent.searchpair_timeout = 500
 
 If looking back for unclosed parenthesis is still too slow, especially during
 a copy-paste operation, or if you don't need indenting inside multi-line
 parentheses, you can completely disable this feature: >
-	let g:pyindent_disable_parentheses_indenting = 1
+	let g:python_indent.disable_parentheses_indenting = 1
+
+For backward compatibility, these variables are also supported: >
+	g:pyindent_open_paren
+	g:pyindent_nested_paren
+	g:pyindent_continue
+	g:pyindent_searchpair_timeout
+	g:pyindent_disable_parentheses_indenting
 
 
 R								*ft-r-indent*
diff --git a/runtime/doc/tags b/runtime/doc/tags
index a7ef8cf..808bd5d 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -4301,6 +4301,8 @@
 E1292	cmdline.txt	/*E1292*
 E1293	textprop.txt	/*E1293*
 E1294	textprop.txt	/*E1294*
+E1295	textprop.txt	/*E1295*
+E1296	textprop.txt	/*E1296*
 E13	message.txt	/*E13*
 E131	eval.txt	/*E131*
 E132	eval.txt	/*E132*
@@ -7446,6 +7448,7 @@
 getscript-history	pi_getscript.txt	/*getscript-history*
 getscript-plugins	pi_getscript.txt	/*getscript-plugins*
 getscript-start	pi_getscript.txt	/*getscript-start*
+getscriptinfo()	builtin.txt	/*getscriptinfo()*
 gettabinfo()	builtin.txt	/*gettabinfo()*
 gettabvar()	builtin.txt	/*gettabvar()*
 gettabwinvar()	builtin.txt	/*gettabwinvar()*
@@ -7901,6 +7904,7 @@
 if_tcl.txt	if_tcl.txt	/*if_tcl.txt*
 ignore-errors	eval.txt	/*ignore-errors*
 ignore-timestamp	editing.txt	/*ignore-timestamp*
+import-autoload	vim9.txt	/*import-autoload*
 import-legacy	vim9.txt	/*import-legacy*
 import-map	vim9.txt	/*import-map*
 improved-autocmds-5.4	version5.txt	/*improved-autocmds-5.4*
@@ -9206,6 +9210,7 @@
 regexp-changes-5.4	version5.txt	/*regexp-changes-5.4*
 register	sponsor.txt	/*register*
 register-faq	sponsor.txt	/*register-faq*
+register-functions	usr_41.txt	/*register-functions*
 register-variable	eval.txt	/*register-variable*
 registers	change.txt	/*registers*
 rego.vim	syntax.txt	/*rego.vim*
diff --git a/runtime/doc/terminal.txt b/runtime/doc/terminal.txt
index 56f0dc8..0b94f8a 100644
--- a/runtime/doc/terminal.txt
+++ b/runtime/doc/terminal.txt
@@ -1022,8 +1022,10 @@
 						*terminal-autoshelldir*
 This can be used to pass the current directory from a shell to Vim.
 Put this in your .vimrc: >
-	def g:Tapi_lcd(_, args: string)
-	    execute 'silent lcd ' .. args
+	def g:Tapi_lcd(_, path: string)
+	    if isdirectory(path)
+                execute 'silent lcd ' .. fnameescape(path)
+            endif
 	enddef
 <
 And, in a bash init file: >
diff --git a/runtime/doc/textprop.txt b/runtime/doc/textprop.txt
index 846915f..996cdd1 100644
--- a/runtime/doc/textprop.txt
+++ b/runtime/doc/textprop.txt
@@ -360,11 +360,16 @@
 		{props} is a dictionary with these fields:
 		   id		remove text properties with this ID
 		   type		remove text properties with this type name
-		   both		"id" and "type" must both match
+		   types	remove text properties with type names in this
+				List
+		   both		"id" and "type"/"types" must both match
 		   bufnr	use this buffer instead of the current one
 		   all		when TRUE remove all matching text properties,
 				not just the first one
-		A property matches when either "id" or "type" matches.
+		Only one of "type" and "types" may be supplied. *E1295*
+
+		A property matches when either "id" or one of the supplied
+		types matches.
 		If buffer "bufnr" does not exist you get an error message.
 		If buffer "bufnr" is not loaded then nothing happens.
 
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 4982498..a4f3a28 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -38,9 +38,6 @@
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Text props: Add "padding" argument - only for when using "text" and {col} is
-zero.  Use tp_len field and n_attr_skip. #10906
-
 Further Vim9 improvements, possibly after launch:
 - Use Vim9 for more runtime files.
 - Check performance with callgrind and kcachegrind.
@@ -244,6 +241,9 @@
 Version of getchar() that does not move the cursor - #10603 Use a separate
 argument for the new flag.
 
+Add "lastline" entry to 'fillchars' to specify a character instead of '@'.
+#10963
+
 test_arglist func Test_all_not_allowed_from_cmdwin() hangs on MS-Windows.
 
 Information for a specific terminal (e.g. gnome, tmux, konsole, alacritty) is
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index 4e210a6..57cdb11 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1349,7 +1349,7 @@
 	did_filetype()		check if a FileType autocommand was used
 	eventhandler()		check if invoked by an event handler
 	getpid()		get process ID of Vim
-	getscriptinfo()	get list of sourced vim scripts
+	getscriptinfo()		get list of sourced vim scripts
 	getimstatus()		check if IME status is active
 	interrupt()		interrupt script execution
 	windowsversion()	get MS-Windows version
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 13e73e3..62a9b20 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -332,7 +332,8 @@
    *+ARP*		Amiga only: ARP support included
 B  *+arabic*		|Arabic| language support
 B  *+autochdir*		support 'autochdir' option
-T  *+autocmd*		|:autocmd|, automatic commands
+T  *+autocmd*		|:autocmd|, automatic commands.  Always enabled since
+			8.0.1564
 H  *+autoservername*	Automatically enable |clientserver|
 m  *+balloon_eval*	|balloon-eval| support in the GUI. Included when
 			compiling with supported GUI (Motif, GTK, GUI) and
diff --git a/runtime/doc/vim9.txt b/runtime/doc/vim9.txt
index 089cb8f..5d1a823 100644
--- a/runtime/doc/vim9.txt
+++ b/runtime/doc/vim9.txt
@@ -1823,7 +1823,7 @@
 
 
 Importing an autoload script ~
-							*vim9-autoload*
+					*vim9-autoload* *import-autoload*
 For optimal startup speed, loading scripts should be postponed until they are
 actually needed.  Using the autoload mechanism is recommended:
 							*E1264*
diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt
index 5951473..5c64897 100644
--- a/runtime/doc/windows.txt
+++ b/runtime/doc/windows.txt
@@ -183,6 +183,8 @@
 		3. 'eadirection' isn't "ver", and
 		4. one of the other windows is wider than the current or new
 		   window.
+		If N was given make the new window N columns wide, if
+		possible.
 		Note: In other places CTRL-Q does the same as CTRL-V, but here
 		it doesn't!