From nobody Thu Aug 01 16:16:52 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 4WZYxx2Ksdz5T0x8; Thu, 01 Aug 2024 16:16:53 +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 4WZYxx0hzMz4gJ1; Thu, 1 Aug 2024 16:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722529013; 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=TSIps5iR5gL4KUQ8BymwAHA4mPJrmTxy6f0VkPhqMug=; b=A3t5d8aMT7bmKFKF/SWvCnkD4hogoBWqVjj8ijSFogvoMKpICt4uQFjhEl4aNZn104eEEx YscwwIipfnZAoeXNI/t0uOPD2eRxDRdD3swTG9UpHYtQWqJvKghNoi6fPmGZcnqlSaZotl twj+i1ehg20tT1+pPcP+Vu6CbDD1MqWRs8u+5PBStN+yzpA/xLTXbxkf+gjPZmNpg2DWXy D9qWP75IrLb7sXQYy9z1bYk3lmJ8icdxddWvk7TZpkKIqw/rAWBTDD6RjrIz4bCU0kSr4y /YvVqup7aPTrdXM8QcnT8SYZaYff04artL2/ZoZ2Zo5NzW8/EQ2UaMjxjLiuyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722529013; a=rsa-sha256; cv=none; b=PdZWAbDy4/kIimjc1OrrdxD/9IdNzi0cxixfbf9IJcCAxO0E9mzu3THbm16L32kJ/bqw0t 2PRvFEo2CcI+V44oiP+YqRaFS1oIAAkI19BAGUZ8qqlV8c/TxdYko+QqUu4Hfp8ZwR52ej FglfOKafwHlmpc0aqUls8CJWt62Cpefs7TSkj5LlTDENyuv0oNjthIctkQ7PrXNKw+7rpv dfshi4t65CRafIAKdFOAdL5kcjrnEa1GNSmH6sACm2bKJsTJv9NShVWnY2cOber9XP0Zqv 0yBx3tF0crpAwnoEAaacq0+pLm3R4WZRgbSKC9g70m3+6cI6PLVgxFslRIiWJg== 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=1722529013; 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=TSIps5iR5gL4KUQ8BymwAHA4mPJrmTxy6f0VkPhqMug=; b=XVzQycUgbOWFMAPAJpNnhXlfJ29qvswUQ0FrphEUBxBj7U3THekMwiGFthj2SQjnH+m+Ag Bt0U3obMZ+KL5T2DkgTbLiaaoy6J04BSjORuOyaWNgiEAWkRaZq/6LXg8PN4+l0aO06nrK tKvsBg99Z+BMi0X5XBSpD5aDLPyqJMZiy0dPeWZ3yGSLk3TtpTfhUAlwfG/zjTBNSob6xF Ua46XYY4kq+pp5Z9eikMm1D/InTmbMVC8QjhkWh/tNaWiFiTzQM9qweqoEErEHeWauN3Ys QLQyAbFwojQn9D+RZ5cy08S8DrnwpNvvGBQz3VgzHJt5foHbHqXISJGEg0H3Cw== 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 4WZYxw6pkzzrws; Thu, 1 Aug 2024 16:16:52 +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 471GGqrf095832; Thu, 1 Aug 2024 16:16:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 471GGqb8095829; Thu, 1 Aug 2024 16:16:52 GMT (envelope-from git) Date: Thu, 1 Aug 2024 16:16:52 GMT Message-Id: <202408011616.471GGqb8095829@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: 094f58809682 - stable/14 - sdiff: Fix usage message. 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: 094f58809682a693918efe6aba5d33d6dae33c25 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=094f58809682a693918efe6aba5d33d6dae33c25 commit 094f58809682a693918efe6aba5d33d6dae33c25 Author: Dag-Erling Smørgrav AuthorDate: 2024-07-29 14:02:25 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-08-01 16:15:57 +0000 sdiff: Fix usage message. The `--ignore-all-space` option was incorrectly documented as `--ignore-all-spaces`. MFC after: 3 days Sponsored by: Klara, Inc. Reviewed by: 0mp, markj Differential Revision: https://reviews.freebsd.org/D46161 (cherry picked from commit ca75b7dac886de66fc06fd31facfa2c561f7567e) --- usr.bin/sdiff/sdiff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/sdiff/sdiff.c b/usr.bin/sdiff/sdiff.c index 6402b85017a7..daa0f43e0b0e 100644 --- a/usr.bin/sdiff/sdiff.c +++ b/usr.bin/sdiff/sdiff.c @@ -130,7 +130,7 @@ static const char *help_msg[] = { "\t-I RE, --ignore-matching-lines=RE: ignore changes whose line matches RE.", "\t-i, --ignore-case: do a case-insensitive comparison.", "\t-t, --expand-tabs: expand tabs to spaces.", - "\t-W, --ignore-all-spaces: ignore all spaces.", + "\t-W, --ignore-all-space: ignore all whitespace.", "\t--speed-large-files: assume large file with scattered changes.", "\t--strip-trailing-cr: strip trailing carriage return.", "\t--ignore-file-name-case: ignore case of file names.",