From e6bad7999a28a545bb833225b148b55c68eb42de Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 13 Dec 2022 16:24:09 +0200
Subject: [PATCH] ; Improve recently installed documentation

* lisp/progmodes/prog-mode.el (prog-fill-reindent-defun): Fix
wording of the doc string.
* doc/emacs/programs.texi (Multi-line Indent): Improve wording of
the description of 'prog-fill-reindent-defun' and related
variables.
---
 doc/emacs/programs.texi     | 19 +++++++++----------
 lisp/progmodes/prog-mode.el |  4 ++--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index 3b60732171e..a6688572134 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -437,16 +437,15 @@ first.
 @vindex beginning-of-defun-function
 @vindex end-of-defun-function
 @vindex fill-paragraph-function
-  Major modes that derive from @code{prog-mode} can either fill a
-single paragraph in a defun, such as a doc-string, or a comment, or
-(re)indent the surrounding defun if point is not in a comment or a
-string by typing @kbd{M-q} or using the command @kbd{M-x
-prog-fill-reindent-defun}.  The bounds of a defun is decided by the
-variable @code{beginning-of-defun-function} and
-@code{end-of-defun-function}, and the filling mechanism is decided by
-@code{fill-paragraph-function} (@ref{List Motion,,, elisp, The Emacs
-Lisp Reference Manual}, or @ref{Filling,,, elisp, The Emacs Lisp
-Reference Manual} for more information).
+  To reindent the entire defun around point, type @kbd{M-q}
+(@code{prog-fill-reindent-defun}).  If point is in a comment or a
+string, this command fills and indents the comment or string instead.
+What exactly constitutes a comment, a string, or a defun depends on
+the major mode: the bounds of a defun are decided by the variables
+@code{beginning-of-defun-function} and @code{end-of-defun-function}
+(@pxref{List Motion,,, elisp, The Emacs Lisp Reference Manual}),
+and the filling mechanism is decided by @code{fill-paragraph-function}
+(@pxref{Filling,,, elisp, The Emacs Lisp Reference Manual}).
 
 @kindex C-u TAB
   If you like the relative indentation within a grouping but not the
diff --git a/lisp/progmodes/prog-mode.el b/lisp/progmodes/prog-mode.el
index 1bd8234dc9c..b46a9affcd3 100644
--- a/lisp/progmodes/prog-mode.el
+++ b/lisp/progmodes/prog-mode.el
@@ -151,8 +151,8 @@ instead."
 If the point is in a string or a comment, fill the paragraph that
 contains point or follows point.
 
-Otherwise, reindent the definition that contains point or follows
-point."
+Otherwise, reindent the function definition that contains point
+or follows point."
   (interactive "P")
   (save-excursion
     (let ((treesit-text-node
-- 
2.39.2