From nobody Thu Aug 01 16:46:54 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WZZcb11vsz5T2ph; Thu, 01 Aug 2024 16:46:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WZZcZ5s5jz4nB0; Thu, 1 Aug 2024 16:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722530814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6vAWTzOtJ/4H/I0MpqcSShSJsGWtRRS2dymQJDgWpS0=; b=Nk5Sw2ArGw3GLcqp74slB80NiOpzD2A7tE8I2WI4rPUJYubeXGQCY+ZLt8/Q09PVd/pOrv wJ72RYLANTcRvubvoueH9c9mu575eX8gK6EdQUn42X/hzwrZtSnIKsu55/kZoUkjOVl703 OByRrkces4opd/nrBviUgSNpNG9jPL0qdrQWfhqwq8C/s34detNxOW3KoypNBMqjdFRbzR BO25xYHrHWZcW8MNQ/Z00A/dubyy8ysYaakwLUXeL6WmsWVLZODU3vG9T7BOgAXK6E1OuC sOkvu3fvu6+8fU4NfsSv3/QJtk34RbtiyQQTal7cQ/NFfNTLGUZroLM25yxSHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722530814; a=rsa-sha256; cv=none; b=vRHpDw5opqluxrJr/tVlGzakviKtLd1DjK0sPpV6zDVXrKbefiLAkC8+WcZ1iWXo/ZNep+ Oe0F/Q0ljnKkZBfwEzFk/uaOeyHsqD/1CpJA1SBmm/+ZdmhsXdQjQxN3sm/BLuZ1e+Ydot 1OpjgEKD2lodsNYF3y7vORM5ok8DW08cuUInN5SvY3rhIFR8QbYiBNLsr+l8rPOwUlvjWC YJ4m0T59D0xKxsNGsEjUkbtf0MFdKNAX8ohy8eKu/QZ9oTL31583EKhpgnhzRK9x7dZDTt 7hv3UQqgr3s7SyJeCDb1Q8hGpfc19h/S1pgxUw7QVVN2Ugqymq86pq4jyT0XcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722530814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6vAWTzOtJ/4H/I0MpqcSShSJsGWtRRS2dymQJDgWpS0=; b=bknKrObx/RdDAQ9UHntW1yC3pDQ3ykRhxww1TDobYnCkQ012AL39e7U2Vlt3ARtzlXEm9m OfIFc1ra4q6+UX/dKM3EtOoRLWuq+r5rpEcyQYhTkICuLSTcC23ww5948OK1asD/p29QTW I93mLxRcepbwR5lAhW50Pji9OXl0TLc1o23sxfvRf2Ks8AN1+oGSeccMMJFh6eYDZ4JXwh MdWL+L9bjpgpgjsiqX9I3H+Ef2B2V0VWO0wXNeLnVzj/kYqjgHQ3p+It8e7WVC8JpO82KV JJPyhwoccq9yJx+Szbf4ypYdHv9vbPia2Qcsh9b5xKyPGJhPmNiwio09wuTJkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WZZcZ5R6czsps; Thu, 1 Aug 2024 16:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 471Gksw2046562; Thu, 1 Aug 2024 16:46:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 471GksoO046559; Thu, 1 Aug 2024 16:46:54 GMT (envelope-from git) Date: Thu, 1 Aug 2024 16:46:54 GMT Message-Id: <202408011646.471GksoO046559@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: ae8b85ac1125 - stable/13 - diff: Fix usage message and documentation. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ae8b85ac11257f1166dfe25c354bf0d4bd64b98d Auto-Submitted: auto-generated 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 AuthorDate: 2024-07-29 14:02:21 +0000 Commit: Dag-Erling Smørgrav 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"