gbranden pushed a commit to branch master
in repository groff.
commit 8301210fb5f2543f0f7d857997c8098c2ebcf09e
Author: G. Branden Robinson <[email protected]>
AuthorDate: Sat Jan 3 21:13:45 2026 -0600
[doc,man]: Migrate .return to "input" term.
Also break input lines consistently between Texinfo and man pages.
Continues the long process of fixing Savannah #65976.
---
doc/groff.texi.in | 22 ++++++++++++++++------
man/groff.7.man | 2 +-
man/groff_diff.7.man | 19 ++++++++++++-------
3 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/doc/groff.texi.in b/doc/groff.texi.in
index 4f7e4fcff..d16205f76 100644
--- a/doc/groff.texi.in
+++ b/doc/groff.texi.in
@@ -15700,12 +15700,22 @@ normally, they modify the value of an existing
object. @xref{als,,the
description of the @code{als} request}, for pitfalls when redefining a
macro that is aliased.
-@Defreq {return, [@Var{anything}]}
-Stop interpreting a macro, skipping to the end of its definition. Do
-not confuse @code{return} with @code{rt}. If called with an argument
-@var{anything}, the skip is performed twice---once within the macro
-being interpreted and once in an enclosing macro. @file{trace.tmac}
-uses this feature to define a wrapper macro for @code{return}.
+@Defreq {return, [@Var{input}]}
+Stop interpreting an interpolated macro,
+skipping to the end of its definition.
+Do not confuse
+@code{return}
+with
+@code{rt}.
+If called with an argument
+@var{input},
+GNU
+@command{troff} @c GNU
+performs the skip twice---once within the macro being interpreted
+and once in an enclosing macro,
+permitting a macro to wrap the request.@footnote{as
+@file{trace.tmac}
+does}
@endDefreq
@menu
diff --git a/man/groff.7.man b/man/groff.7.man
index f2f1749f1..7b014498c 100644
--- a/man/groff.7.man
+++ b/man/groff.7.man
@@ -4790,7 +4790,7 @@ Stop interpreting an interpolated macro,
skipping the remainder of its definition.
.
.TPx
-.REQ .return anything
+.REQ .return input
As
.BR return ,
but perform the skip twice\[em]once within the macro being interpreted
diff --git a/man/groff_diff.7.man b/man/groff_diff.7.man
index a4d4f0dcf..0725cd143 100644
--- a/man/groff_diff.7.man
+++ b/man/groff_diff.7.man
@@ -4085,11 +4085,10 @@ cannot be removed.
.
.TP
.BR .return\~ [\c
-.IR anything ]
+.IR input ]
.\" XXX: useless request warning if not interpreting a macro?
-In a macro definition,
-stop interpretation,
-skipping to its end.
+Stop interpreting an interpolated macro,
+skipping to the end of its definition.
.
Do not confuse
.RB \[lq] return \[rq]
@@ -4097,10 +4096,16 @@ with
.BR rt .
.
If called with an argument
-.I anything,
-the skip is performed twice\[em]once within the macro being interpreted
+.I input,
+GNU
+.I troff \" GNU
+performs the skip twice\[em]once within the macro being interpreted
and once in an enclosing macro,
-permitting a macro to wrap the request.
+permitting a macro to wrap the request
+(as
+.I trace\:.tmac
+does).
+.
.
.
.TP
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
