diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index 3a1581b2b4..1690042fc9 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -867,7 +867,7 @@ to insert special things while typing you can use the CTRL-R command.  For
 example, "%" stands for the current file name, while CTRL-R % inserts the
 current file name right away.  See |c_CTRL-R|.
 
-Note:  If you want to avoid the effects of special characters in a Vim script
+Note: If you want to avoid the effects of special characters in a Vim script
 you may want to use |fnameescape()|.  Also see |`=|.
 
 
@@ -1239,8 +1239,10 @@ Example: >
 	:au CmdwinLeave :  let &cpt = b:cpt_save
 This sets 'complete' to use completion in the current window for |i_CTRL-N|.
 Another example: >
-	:au CmdwinEnter [/?]  startinsert
+	:au CmdwinEnter [/\?]  startinsert
 This will make Vim start in Insert mode in the command-line window.
+Note: The "?" needs to be escaped, as this is a |file-pattern|.  See also
+|cmdline-autocompletion|.
 
 					*cmdline-char* *cmdwin-char*
 The character used for the pattern indicates the type of command-line:
diff --git a/runtime/doc/vimfn.txt b/runtime/doc/vimfn.txt
index 9dc35a7cf9..d9c04e0de3 100644
--- a/runtime/doc/vimfn.txt
+++ b/runtime/doc/vimfn.txt
@@ -11911,6 +11911,11 @@ wildtrigger()                                                    *wildtrigger()*
 		To retain normal history navigation (up/down keys): >vim
 			cnoremap <Up>   <C-U><Up>
 			cnoremap <Down> <C-U><Down>
+<
+		To set an option specifically when performing a search, e.g.
+		to set 'pumheight': >vim
+			autocmd CmdlineEnter [/\?] set pumheight=8
+			autocmd CmdlineLeave [/\?] set pumheight&
 <
 		Return value is always 0.
 
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 3fdc45eaf6..6c57179ca4 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -10844,6 +10844,11 @@ function vim.fn.wildmenumode() end
 ---   cnoremap <Up>   <C-U><Up>
 ---   cnoremap <Down> <C-U><Down>
 --- <
+--- To set an option specifically when performing a search, e.g.
+--- to set 'pumheight': >vim
+---   autocmd CmdlineEnter [/\?] set pumheight=8
+---   autocmd CmdlineLeave [/\?] set pumheight&
+--- <
 --- Return value is always 0.
 ---
 --- @return number
diff --git a/src/nvim/eval.lua b/src/nvim/eval.lua
index e38198ce59..e00bafc92d 100644
--- a/src/nvim/eval.lua
+++ b/src/nvim/eval.lua
@@ -13102,6 +13102,11 @@ M.funcs = {
       	cnoremap <Up>   <C-U><Up>
       	cnoremap <Down> <C-U><Down>
       <
+      To set an option specifically when performing a search, e.g.
+      to set 'pumheight': >vim
+      	autocmd CmdlineEnter [/\?] set pumheight=8
+      	autocmd CmdlineLeave [/\?] set pumheight&
+      <
       Return value is always 0.
     ]==],
     name = 'wildtrigger',