From owner-dev-commits-src-branches@freebsd.org Sun Dec 27 13:10:37 2020 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8513C4BAB68; Sun, 27 Dec 2020 13:10:37 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D3gz13Pgxz4cPp; Sun, 27 Dec 2020 13:10:37 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 67B8B27982; Sun, 27 Dec 2020 13:10:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 0BRDAbkg062279; Sun, 27 Dec 2020 13:10:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 0BRDAbgV062278; Sun, 27 Dec 2020 13:10:37 GMT (envelope-from git) Date: Sun, 27 Dec 2020 13:10:37 GMT Message-Id: <202012271310.0BRDAbgV062278@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 8f4d46cbc782 - stable/12 - MFC r368816: trim(8): Fix a few issues reported by mandoc MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 8f4d46cbc782ec57f9ce8c9b18cefea505ad94ce Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "Commit messages for the stable branches of the src repository." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Dec 2020 13:10:37 -0000 The branch stable/12 has been updated by gbe (doc committer): URL: https://cgit.FreeBSD.org/src/commit/?id=8f4d46cbc782ec57f9ce8c9b18cefea505ad94ce commit 8f4d46cbc782ec57f9ce8c9b18cefea505ad94ce Author: Gordon Bergling AuthorDate: 2020-12-19 13:56:19 +0000 Commit: Gordon Bergling CommitDate: 2020-12-27 13:08:02 +0000 MFC r368816: trim(8): Fix a few issues reported by mandoc - new sentence, new line - unusual Xr order: ioctl(2) after da(4) - unusual Xr order: sysexits(3) after nda(4) (cherry picked from commit a652079615ac3cb503e516e50246284bb4ad60eb) --- usr.sbin/trim/trim.8 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/usr.sbin/trim/trim.8 b/usr.sbin/trim/trim.8 index 22727181d882..abd306ab70af 100644 --- a/usr.sbin/trim/trim.8 +++ b/usr.sbin/trim/trim.8 @@ -60,10 +60,12 @@ The following options are available: Do not actually erase anything but show what it would do (dry run). Implies .Fl v . -This is the default. Overrides +This is the default. +Overrides .Fl f . .It Fl f -Perform the operation. Overrides +Perform the operation. +Overrides .Fl N . .It Fl l Xo .Sm off @@ -150,11 +152,11 @@ is special device file not supporting DIOCGMEDIASIZE (probably not a disk), so its size cannot be examined. .El .Sh SEE ALSO +.Xr ioctl 2 , +.Xr sysexits 3 , .Xr ada 4 , .Xr da 4 , -.Xr ioctl 2 , -.Xr nda 4 , -.Xr sysexits 3 +.Xr nda 4 .Sh HISTORY The .Nm