From nobody Thu Aug 01 16:16:51 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 4WZYxw0yzcz5T0jG; Thu, 01 Aug 2024 16:16:52 +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 4WZYxv6f32z4gL8; Thu, 1 Aug 2024 16:16:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722529011; 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=GACh6Jc8COdoLgBKBwre3JyS+NaQTbzbGAxB2hz7ce8=; b=Tz4IV8gCeb4Krz3MMExf9+ngfYWoRmmZbN6IIZnkCwkLFCjLTGIYBG0/t93E+syQwgtBRC dXxpe8kFRt95oeuN0Tu1ownotyFPS+SXuajFMkiyq4HZTiL1Q42CWhY56ta4R+TuLtw6xS 9V/01N06GqYhev8fo4m8pUJ9aAqLcfDy3kG0EA5xssgsqBE+yFpsOl2Mhqi0VTpJXw9LKj rfnTasdgofWydwAwOsjBBKU0ykkSI9i8CnpQkYxveQ8yv4zj21DNA9fL7hyFveV4jC1KuM ImSmY/pjHfiUqe8eWRd5ymI9Rz+rvy1+4FPgSbC/FXejLgceff6gqRxDlTZh0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722529011; a=rsa-sha256; cv=none; b=vTv1b4hgpdmUDyE5t+Eu6H0ipcHIfoG9At+7T8NXdwRwisMXUigxRnHBN6cOgQG9gKgk8J Jq+RXvCI8tDFS/MSsem+dCyZ5wZO1kQMgBBHcDJgLxapJUQQq449KueLBQb5ZOw41oBcdB q/urHPxyhihozhgG7A0ZblkHxrHssKlxz5ACPd4qU6dfyP+PkQ1NoT+8c+bR6Du/1jSpAz ZSEZrOCJcM0qFXlTgxtje8HAFJafdV17UR9L5AZ8rpNujqv4uEMxWfv57EmvNMcSMIiczp 37FiwWNCmzdb4QahiSjzhWWq+3L7Bj/o38QfxfDRTPAW/a6Owcz/1rBi6tcPeA== 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=1722529011; 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=GACh6Jc8COdoLgBKBwre3JyS+NaQTbzbGAxB2hz7ce8=; b=KAmND36qz6FMlUdf2pQUFUO9VnPtx0MwKUTO/Vt1d+p3SusW9A1pfGE2KTlzDkIWe1aLsH twv36BYXXMxHmj43M1bkbeD80zMftbeJrFN2meDy1ht7ZouibaleKO6uDFPM1Rc5HbAcJ2 fStTdKhsyiD0JgvaSreto+w7X0LGhagzSCzJNsr9bieyZRWtOkeeNNNTCjPuv8h2jbJWqb 80R6unOu2mQwKCPTrMpITU4QYJpYTgeoT/vIxoPg8BDKi9iBfKR6smOSwtYuC1btNkCc2h 6el2B5Yqa9B/pUNdtCbCUOB2iYPk+Mpa0ASWGEsRWMmH8tc9p5h+zvkf3LMehw== 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 4WZYxv6G35zs98; Thu, 1 Aug 2024 16:16:51 +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 471GGpBa095790; Thu, 1 Aug 2024 16:16:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 471GGpvn095787; Thu, 1 Aug 2024 16:16:51 GMT (envelope-from git) Date: Thu, 1 Aug 2024 16:16:51 GMT Message-Id: <202408011616.471GGpvn095787@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: 45fc37334d07 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 45fc37334d077d635dbfdd13f5e085513bf09d49 Auto-Submitted: auto-generated 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 AuthorDate: 2024-07-29 14:02:21 +0000 Commit: Dag-Erling Smørgrav 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"