git: ae8b85ac1125 - stable/13 - diff: Fix usage message and documentation.

The branch stable/13 has been updated by des:

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

commit ae8b85ac11257f1166dfe25c354bf0d4bd64b98d
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:43:02 +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 19c4fa0579f3..c75e2ec95de0 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 19, 2020
+.Dd July 26, 2024
 .Dt DIFF 1
 .Os
 .Sh NAME
@@ -184,7 +184,7 @@
 .Nm diff
 .Op Fl aBbditwW
 .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
@@ -380,7 +380,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 a5128944674b..71f0ac94c7ab 100644
--- a/usr.bin/diff/diff.c
+++ b/usr.bin/diff/diff.c
@@ -532,7 +532,7 @@ usage(void)
 	    "       diff [-aBbdilNPprsTtw] [-c | -e | -f | -n | -q | -u] [--ignore-case]\n"
 	    "            [--no-ignore-case] [--normal] [--tabsize] [-I pattern] [-L label]\n"
 	    "            [-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"