git: 45fc37334d07 - stable/14 - diff: Fix usage message and documentation.

The branch stable/14 has been updated by des:

URL: https://cgit.FreeBSD.org/src/commit/?id=45fc37334d077d635dbfdd13f5e085513bf09d49

commit 45fc37334d077d635dbfdd13f5e085513bf09d49
Author:     Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2024-07-29 14:02:21 +0000
Commit:     Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2024-08-01 16:15:57 +0000

    diff: Fix usage message and documentation.
    
    The `--ignore-all-space` option was incorrectly documented as
    `--ignore-all-blanks` in some (but not all) places.
    
    MFC after:      3 days
    PR:             280434
    Sponsored by:   Klara, Inc.
    Reviewed by:    0mp, markj
    Differential Revision:  https://reviews.freebsd.org/D46160
    
    (cherry picked from commit ab830de9f58c1b257e42b4fbdd46b3ca6a837ee6)
---
 usr.bin/diff/diff.1 | 6 +++---
 usr.bin/diff/diff.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr.bin/diff/diff.1 b/usr.bin/diff/diff.1
index c10b130a2d72..3996f0388665 100644
--- a/usr.bin/diff/diff.1
+++ b/usr.bin/diff/diff.1
@@ -29,7 +29,7 @@
 .\"
 .\"     @(#)diff.1	8.1 (Berkeley) 6/30/93
 .\"
-.Dd June 29, 2024
+.Dd July 26, 2024
 .Dt DIFF 1
 .Os
 .Sh NAME
@@ -199,7 +199,7 @@
 .Op Fl aBbditwW
 .Op Fl -color Ns = Ns Ar when
 .Op Fl -expand-tabs
-.Op Fl -ignore-all-blanks
+.Op Fl -ignore-all-space
 .Op Fl -ignore-blank-lines
 .Op Fl -ignore-case
 .Op Fl -minimal
@@ -422,7 +422,7 @@ output adds character(s) to the front of each line which may screw up
 the indentation of the original source lines and make the output listing
 difficult to interpret.
 This option will preserve the original source's indentation.
-.It Fl w -ignore-all-blanks
+.It Fl w -ignore-all-space
 Is similar to
 .Fl b -ignore-space-change
 but causes whitespace (blanks and tabs) to be totally ignored.
diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c
index 24e851ae9dbf..ba88964ca131 100644
--- a/usr.bin/diff/diff.c
+++ b/usr.bin/diff/diff.c
@@ -592,7 +592,7 @@ usage(void)
 	    "       diff [-aBbdilNPprsTtw] [-c | -e | -f | -n | -q | -u] [--ignore-case]\n"
 	    "            [--no-ignore-case] [--normal] [--tabsize] [-I pattern] [-L label]\n"
 	    "            [-F pattern] [-S name] [-X file] [-x pattern] dir1 dir2\n"
-	    "       diff [-aBbditwW] [--expand-tabs] [--ignore-all-blanks]\n"
+	    "       diff [-aBbditwW] [--expand-tabs] [--ignore-all-space]\n"
 	    "            [--ignore-blank-lines] [--ignore-case] [--minimal]\n"
 	    "            [--no-ignore-file-name-case] [--strip-trailing-cr]\n"
 	    "            [--suppress-common-lines] [--tabsize] [--text] [--width]\n"