Merge from origin/emacs-30

d66b8d4becb Fix checkbox's child creation
26c5fadf474 Document that 'package-vc' doesn't support built-in packages
ee61b9a050b ; Fix documentation of completion commands
ce43d13593a ; Simplify admin/run-codespell
fa1470d0699 ; Remove duplicated word in files.el Commentary
dabaea97465 Improve checkdoc-common-verbs-wrong-voice docstring
6de2ee5663d Document string-as-{unibyte,multibyte} as obsolete in manual
7f76f872ebf Fix go-ts-mode var spec indentation (Bug#75362)
01464fc882d Add "text" as a thing in tsx-ts-mode
59c57337923 Improve doc string of 'package-delete'
313a191d047 ; * admin/MAINTAINERS: Remove Kelvin White.
002960ceabf Clarify that 'mac' line ending convention is not used on ...
4210e065648 Add language server for Odin
ee1034422b0 ; Improve documentation of function-type display
1c49edc4080 Modernize "Commentary" section of files.el
505c1123e18 * INSTALL: Add advice how to invoke 'make install'.  (Bug...
82e16cae9cc Improve the documentation of 'key-valid-p'

# Conflicts:
#	etc/NEWS
#	lisp/progmodes/typescript-ts-mode.el

1 files changed, 5 insertions, 5 deletions

diff --git a/src/minibuf.c b/src/minibuf.c
index 6ac3216a62f..bbbc4399ab0 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1297,11 +1297,6 @@ barf_if_interaction_inhibited (void)
 DEFUN ("read-from-minibuffer", Fread_from_minibuffer,
        Sread_from_minibuffer, 1, 7, 0,
        doc: /* Read a string from the minibuffer, prompting with string PROMPT.
-While in the minibuffer, you can use \\<minibuffer-local-completion-map>\\[minibuffer-complete] and \\[minibuffer-complete-word] to complete your input.
-You can also use \\<minibuffer-local-map>\\[minibuffer-complete-history] to complete using history items in the
-input history HIST, and you can use \\[minibuffer-complete-defaults] to complete using
-the default items in DEFAULT-VALUE.
-
 The optional second arg INITIAL-CONTENTS is an obsolete alternative to
   DEFAULT-VALUE.  It normally should be nil in new code, except when
   HIST is a cons.  It is discussed in more detail below.
@@ -1977,6 +1972,11 @@ which case that function should itself handle `completion-regexp-list').  */)
 
 DEFUN ("completing-read", Fcompleting_read, Scompleting_read, 2, 8, 0,
        doc: /* Read a string in the minibuffer, with completion.
+While in the minibuffer, you can use \\<minibuffer-local-completion-map>\\[minibuffer-complete] and \\[minibuffer-complete-word] to complete your input.
+You can also use \\<minibuffer-local-map>\\[minibuffer-complete-history] to complete using history items in the
+input history HIST, and you can use \\[minibuffer-complete-defaults] to complete using
+the default items in DEFAULT-VALUE.
+
 PROMPT is a string to prompt with; normally it ends in a colon and a space.
 COLLECTION can be a list of strings, an alist, an obarray or a hash table.
 COLLECTION can also be a function to do the completion itself.