From nobody Fri Jun 6 12:05:17 2025 X-Original-To: dev-commits-src-main@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 4bDKl164SBz5yG9c; Fri, 06 Jun 2025 12:05:17 +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 4bDKl135GQz3s8B; Fri, 06 Jun 2025 12:05:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749211517; 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=gWxrBex9KNRlszJvH4Cbh+3cmc2yoTsaoSJn4/tYtEM=; b=OOtazOgJYBek/KnSxB79nDsViLo2M3ZB3HFH8WiaNCenUNnPYcZtKCJHhle422Q76YOjrH /oPPOQIhX7fZzLGa8tCNrIGtS4Wl0rM5mEX8Es/uj7FWOmRM/s+DyS3n/fOGx1701I/u5C SWW2Khmvn5r1DjxGU7+5SkwWXOSkmcpcreJM65HIxUT0S5MdfyFQcOCws5h+mlvf5l8/V9 Cywxv64u06F7RSRCasfVlqOnNDm36ZbXjkDk1FZ7Y8HX2fS8Qm8CZS9T3+nhEP9YpXcd+u +Hu6fUAHEEY9CGHCkhVy7/qatMF/MKYAxhIj7J3ks63oS+xV2kqOMG++xT7jpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749211517; 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=gWxrBex9KNRlszJvH4Cbh+3cmc2yoTsaoSJn4/tYtEM=; b=gWjTAO70YD/7Sp1T8y4LLlbMApYTqxiwNLC2LtMivMNC65L4D7rYIJl7HYgrNfAgRUNiG8 X/rG3vMgVtEW0GWXaKUkYHQ1eWtD66LEurBgKaYrfZBs+oSkdNyDrJ9gv8snSKzHlpToX9 aM4MuFTs1Cy1qsROOqrbbbN9RaI1P01RbN5Mn5Ya4inEJ8+U1vmrIfWmqCfondUpql7vnI qLbEEN2S+e5UpzQcFbvkOu3RghlOS4vPAwFHlLZOCM3zlypjimn53L1Kt09EAm5JimlLx6 uBm8eSVJuZ5jMvGiVe8WrrgKEMfjNcgULykdzCUMwg7GTnpF4OzhsLzkz/oDDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749211517; a=rsa-sha256; cv=none; b=pIh5jKCUnv/n2U/j4UpNksPv1adoLjdKBXgKpneC81WpbcA/544sDoUvDYVvYX5a+6dHBc MtsYCNC/xdybo4/74nOSNI2Qze5wJICDATf7bf1HuKZCetSvGhdNzNDO8CJAV5t2ju1rII 00D3kGyAH6qG6d9GGybV0qMmQ2h53Y7xEw08KrIKmC4Xu/b6mSI5BAz2DuD5viAKvo0AgD zA4VWaAWympA4SxGouqPiJH0TLFUZPvN+f4UQDN+kGJDN3/1rby8qhEJw4FZyL4+AOvhX8 EfWNQ8KEOkQcs3/YSOCQ3A0kYBQcj+B83c99f9bx4ww0OaT1EnV9AxzqrPU0LA== 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 4bDKl12fbkzvDm; Fri, 06 Jun 2025 12:05:17 +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 556C5HI7078080; Fri, 6 Jun 2025 12:05:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 556C5HHI078077; Fri, 6 Jun 2025 12:05:17 GMT (envelope-from git) Date: Fri, 6 Jun 2025 12:05:17 GMT Message-Id: <202506061205.556C5HHI078077@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: e945411697cf - main - diff: minor fixes to manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: e945411697cfaf9e57ef9ffdf9d35dfd9778612b Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=e945411697cfaf9e57ef9ffdf9d35dfd9778612b commit e945411697cfaf9e57ef9ffdf9d35dfd9778612b Author: Pau Amma AuthorDate: 2025-06-06 12:04:04 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-06-06 12:05:05 +0000 diff: minor fixes to manual page * Add missing dash before long option name in synopsis. * Remove spurious paragraph break and bullet item. * While there, fix mandoc -T lint complaints. Reviewed by: ziaee, des Differential Revision: https://reviews.freebsd.org/D48388 --- usr.bin/diff/diff.1 | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/usr.bin/diff/diff.1 b/usr.bin/diff/diff.1 index 559434d8e4fb..47f9c11eb3db 100644 --- a/usr.bin/diff/diff.1 +++ b/usr.bin/diff/diff.1 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-3-Clause +.\" .\" $OpenBSD: diff.1,v 1.47 2015/11/24 19:35:41 jmc Exp $ .\" .\" Copyright (c) 1980, 1990, 1993 @@ -27,7 +30,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 26, 2024 +.Dd January 7, 2025 .Dt DIFF 1 .Os .Sh NAME @@ -95,7 +98,7 @@ .Op Fl -strip-trailing-cr .Op Fl -tabsize Ar number .Op Fl -text -.Fl C Ar number | -context Ar number +.Fl C Ar number | Fl -context Ar number .Ar file1 file2 .Nm diff .Op Fl aBbdiltw @@ -354,7 +357,7 @@ Files differ and only the second file contains the line. .Pp Comparison options: .Bl -tag -width Ds -.It Fl A Ar algo, Fl -algorithm Ar algo +.It Fl A Ar algo , Fl -algorithm Ar algo Configure the algorithm used when comparing files. .Nm supports 3 algorithms: @@ -420,9 +423,9 @@ environment variable is set to a non-empty string. Try very hard to produce a diff as small as possible. This may consume a lot of processing power and memory when processing large files with many changes. -.It Fl F Ar pattern, Fl -show-function-line Ar pattern +.It Fl F Ar pattern , Fl -show-function-line Ar pattern Like -.Fl p, +.Fl p , but display the last line that matches provided pattern. .It Fl I Ar pattern Fl -ignore-matching-lines Ar pattern Ignores changes, insertions, and deletions whose lines match the @@ -483,7 +486,7 @@ Output at most columns when using side by side format. The default value is 130. Note that unless -.It Fl t +.Fl t was specified, .Nm will always align the second column to a tab stop, so values of @@ -695,7 +698,7 @@ number. .Bl -tag -width DIFFCOLORS .It Ev DIFFCOLORS The value of this variable is the form -.Ar add Ns : Ns Ar rm , +.Ar add : Ns Ar rm , where .Ar add is the ASCII escape sequence for additions and @@ -818,4 +821,5 @@ by a BSD-licensed implementation written by Some GNUisms were lost in the process. .Pp libdiff was imported from the Game of Trees version control system and default -algorithm was changed to Myers for FreeBSD 15. +algorithm was changed to Myers for +.Fx 15 .