diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 58dfaaa16..2174e69ac 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -1497,13 +1497,16 @@ Drop selection and keep selection mode enabled.
 
 [[follow-hint]]
 === follow-hint
-Syntax: +:follow-hint ['keystring']+
+Syntax: +:follow-hint [*--select*] ['keystring']+
 
 Follow a hint.
 
 ==== positional arguments
 * +'keystring'+: The hint to follow.
 
+==== optional arguments
+* +*-s*+, +*--select*+: Only select the given hint, don't necessarily follow it.
+
 [[leave-mode]]
 === leave-mode
 Leave the mode we're currently in.
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index a9e7becd2..fc809b98e 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -358,11 +358,8 @@ The following modes are available:
 
 * prompt: Entered when there's a prompt to display, like for download
   locations or when invoked from JavaScript.
-  +
-  You can bind normal keys in this mode, but they will be only active when
-  a yes/no-prompt is asked. For other prompt modes, you can only bind
-  special keys.
 
+* yesno: Entered when there's a yes/no prompt displayed.
 * caret: Entered when pressing the `v` mode, used to select text using the
   keyboard.
 
@@ -642,11 +639,17 @@ Default:
 * +pass:[<Shift-Tab>]+: +pass:[prompt-item-focus prev]+
 * +pass:[<Tab>]+: +pass:[prompt-item-focus next]+
 * +pass:[<Up>]+: +pass:[prompt-item-focus prev]+
-* +pass:[n]+: +pass:[prompt-accept no]+
-* +pass:[y]+: +pass:[prompt-accept yes]+
 - +pass:[register]+:
 
 * +pass:[<Escape>]+: +pass:[leave-mode]+
+- +pass:[yesno]+:
+
+* +pass:[<Alt-Shift-Y>]+: +pass:[prompt-yank --sel]+
+* +pass:[<Alt-Y>]+: +pass:[prompt-yank]+
+* +pass:[<Escape>]+: +pass:[leave-mode]+
+* +pass:[<Return>]+: +pass:[prompt-accept]+
+* +pass:[n]+: +pass:[prompt-accept no]+
+* +pass:[y]+: +pass:[prompt-accept yes]+
 
 [[bindings.key_mappings]]
 === bindings.key_mappings