From e5990526859af7b62eb3840a9a6806c81c23b693 Mon Sep 17 00:00:00 2001
From: James Youngman <address@hidden>
Date: Sat, 4 May 2019 00:42:39 +0100
Subject: [PATCH] doc: fix bug #56142 by specifying which actions inhibit the
 default -print
To: address@hidden

* find/find.1: specify which actions inhibit the default -print
action.
* doc/find.texi (find Expressions): Likewise.
---
 NEWS          |  3 +++
 doc/find.texi | 13 +++++++++----
 find/find.1   | 25 +++++++++++++++++++++----
 3 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/NEWS b/NEWS
index 47338232..002b104d 100644
--- a/NEWS
+++ b/NEWS
@@ -61,6 +61,9 @@ Some minor documentation improvements are listed in "Bug Fixes" below.
 
 ** Bug Fixes
 
+#56142: doc: fix bug #56142 by specifying which actions inhibit the
+        default -print.
+
 #55272: find: improve diagnostic when -name or -iname is used with a pattern
         containing a directory separator ('/'), suggesting to use -wholename
         or -iwholename respectively.
diff --git a/doc/find.texi b/doc/find.texi
index 262af12a..a410b295 100644
--- a/doc/find.texi
+++ b/doc/find.texi
@@ -306,10 +306,15 @@ evaluated.
 
 You can omit the operator between two primaries; it defaults to
 @samp{-and}.  @xref{Combining Primaries With Operators}, for ways to
-connect primaries into more complex expressions.  If the expression
-contains no actions other than @samp{-prune}, @samp{-print} is
-performed on all files for which the entire expression is true
-(@pxref{Print File Name}).
+connect primaries into more complex expressions.
+
+The @samp{-print} action is performed on all files for which the
+entire expression is true (@pxref{Print File Name}), unless the
+expression contains an action other than @samp{-prune} or
address@hidden Actions which inhibit the default @samp{-print} are
address@hidden, @samp{-exec}, @samp{-execdir}, @samp{-ok},
address@hidden, @samp{-fls}, @samp{-fprint}, @samp{-fprintf},
address@hidden, @samp{-print} and @samp{-printf}.
 
 Options take effect immediately, rather than being evaluated for each
 file when their place in the expression is reached.  Therefore, for
diff --git a/find/find.1 b/find/find.1
index 04fbbd7d..ca4b4703 100644
--- a/find/find.1
+++ b/find/find.1
@@ -358,12 +358,29 @@ include for example
 is assumed.
 
 .P
-If the whole expression contains no actions other than
-.B \-prune
+The
+.B \-print
+action is performed on all files for which the whole expression is
+true, unless it contains an action other than
+.BR \-prune
 or
-.BR \-print ,
+.BR \-quit .
+Actions which inhibit the default
 .B \-print
-is performed on all files for which the whole expression is true.
+are
+.BR \-delete ,
+.BR \-exec ,
+.BR \-execdir ,
+.BR \-ok ,
+.BR \-okdir ,
+.BR \-fls ,
+.BR \-fprint ,
+.BR \-fprintf ,
+.BR \-ls ,
+.BR \-print
+and
+.BR \-printf .
+
 
 The
 .B \-delete
-- 
2.11.0