From nobody Fri Apr 08 09:03:54 2022 X-Original-To: dev-commits-src-branches@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 B8C001A8CC34; Fri, 8 Apr 2022 09:03: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KZXNp4Q9yz4T10; Fri, 8 Apr 2022 09:03:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649408635; 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=VbmS8lG5kPEHygZDBmu8G4/x/1jGIOyyqutGORYYeJ8=; b=SbZc41JVFcMQeJyrGN8+gtZhpuB9/r0kiC/ZNWOZRGdcN6EYSPbKrtrZyTeREVrYYhpfUz x6cKMPrlo/FYYvSu2XL9at1j6PgJ2N6pVx/QWFp4DvqRU380c0neHzut3ICbVPVT81S8sC fXLGabk48ANwd6gHIgpaKQR4uZ1Y00XhT6gArpqco/oYmf21zVLU5+ij2TAymiFnOc77yc Dio1r7gNp/BO+QI+BXr21AccvuLdvd/DznEf8oN5ZmjyG4LFQV/2HXBuhXNkH6CgBufMZv kEUCZExxEptNmHkC4GrQlPSbGr3ZMzAUPCHCN0Mrz/0xhvhpMl2HJTVjWNjKiQ== 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 5566221EA6; Fri, 8 Apr 2022 09:03:54 +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 23893sAH015175; Fri, 8 Apr 2022 09:03:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23893snY015174; Fri, 8 Apr 2022 09:03:54 GMT (envelope-from git) Date: Fri, 8 Apr 2022 09:03:54 GMT Message-Id: <202204080903.23893snY015174@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: f888297551d0 - stable/12 - pw.8: Sort flags in synopsis List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: f888297551d078393a2ac9d0a8aa629e68c63a28 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649408635; 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=VbmS8lG5kPEHygZDBmu8G4/x/1jGIOyyqutGORYYeJ8=; b=wZBcr/nn24iXmfGANbmst2VivOLbYLjLoIB/aiz+sK+rSdOmTUX/ntHYb5yQArR/8EUMlD XL1iLaPq71LWgZkdIggAl9ovr7160+Kyea8qDMKYDBUsG05SivWvMB2FcnxDzuUZcrLF2E QWsVikT26TDEFurBwPtzTr4v9OmMjm4eyWNmIM/npzbzCOMwIyPeffcFk4jJZ/FWr3pQTH Ylo1YPGixawljAr3pxXXV9A4V/ntdHrc4hJywi7kqpbSREtsq0BDE1oDo2d3LZeyPWClcI 9vQvxXzQOezduARz7C8WaJEA11CedOvrL2TrV0TYSXqbxeJIEVmf6+l4lXCWvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649408635; a=rsa-sha256; cv=none; b=IowRUuJ6GgiBsY09+uY73j2D54AHYpYcHpOqlDzMi9SiGImF7YG9Uwt7kwlkdPfYLyRZCy Pe1UU0shT4ZbfQRrj4fYctZwQ4suirBUm/yb8Wb+lNhbeNBaFKnRtxxiDcyAGjlt/pmqJg gb53UDO1AY2pts7TkiSgzgqq6VtCJHuTfuG5d9UXa0PpLhdRsWlyVVQC6AhlORZwP1hWj2 88dmypzKwbonnPdWgHxUXMay6OMXKLkCG5o6s/ubpD7+R2TeQx8HFvrp9fXyjXh57GiR0O nbdG4VF9Lkd9v0n3IoZ/x7vnMm4lgw/fVhS23Ahcma9OjIPceCWjqFJ3wTZeCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by 0mp (doc, ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=f888297551d078393a2ac9d0a8aa629e68c63a28 commit f888297551d078393a2ac9d0a8aa629e68c63a28 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2022-04-01 22:49:10 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2022-04-08 08:59:34 +0000 pw.8: Sort flags in synopsis MFC after: 1 week (cherry picked from commit 39245a7d45ccdda961ae19bfa2b7dcb3d24ae86c) --- usr.sbin/pw/pw.8 | 104 +++++++++++++++++++++++-------------------------------- 1 file changed, 44 insertions(+), 60 deletions(-) diff --git a/usr.sbin/pw/pw.8 b/usr.sbin/pw/pw.8 index 2ea9729c1031..5ca9b155da35 100644 --- a/usr.sbin/pw/pw.8 +++ b/usr.sbin/pw/pw.8 @@ -35,133 +35,117 @@ .Op Fl R Ar rootdir .Op Fl V Ar etcdir .Cm useradd -.Oo Fl n Oc Ar name Oo Fl u Ar uid Oc +.Oo Fl n Oc Ar name +.Op Fl mNoPqY .Op Fl C Ar config -.Op Fl q .Op Fl c Ar comment .Op Fl d Ar dir .Op Fl e Ar date -.Op Fl p Ar date -.Op Fl g Ar group .Op Fl G Ar grouplist -.Op Fl m -.Op Fl M Ar mode +.Op Fl g Ar group +.Op Fl H Ar fd +.Op Fl h Ar fd .Op Fl k Ar dir -.Op Fl w Ar method -.Op Fl s Ar shell -.Op Fl o .Op Fl L Ar class -.Op Fl h Ar fd | Fl H Ar fd -.Op Fl N -.Op Fl P -.Op Fl Y +.Op Fl M Ar mode +.Op Fl p Ar date +.Op Fl s Ar shell +.Op Fl u Ar uid +.Op Fl w Ar method .Nm .Op Fl R Ar rootdir .Op Fl V Ar etcdir .Cm useradd .Fl D -.Op Fl C Ar config .Op Fl q .Op Fl b Ar dir +.Op Fl C Ar config .Op Fl e Ar days -.Op Fl p Ar days -.Op Fl g Ar group .Op Fl G Ar grouplist +.Op Fl g Ar group +.Op Fl i Ar min , Ns Ar max .Op Fl k Ar dir +.Op Fl p Ar days +.Op Fl s Ar shell .Op Fl M Ar mode .Op Fl u Ar min , Ns Ar max -.Op Fl i Ar min , Ns Ar max .Op Fl w Ar method -.Op Fl s Ar shell .Op Fl y Ar path .Nm .Op Fl R Ar rootdir .Op Fl V Ar etcdir .Cm userdel -.Oo Fl n Oc Ar name Ns | Ns Ar uid | Fl u Ar uid -.Op Fl r -.Op Fl Y +.Oo Fl n Oc Ar name Ns | Ns Oo Fl u Oc Ar uid +.Op Fl rY .Nm .Op Fl R Ar rootdir .Op Fl V Ar etcdir .Cm usermod .Oo Fl n Oc Ar name Ns | Ns Ar uid Oo Fl u Ar newuid Oc | Fl u Ar uid +.Op Fl mNPqY .Op Fl C Ar config -.Op Fl q .Op Fl c Ar comment .Op Fl d Ar dir .Op Fl e Ar date -.Op Fl p Ar date -.Op Fl g Ar group +.Op Fl k Ar dir .Op Fl G Ar grouplist +.Op Fl g Ar group +.Op Fl H Ar fd +.Op Fl h Ar fd +.Op Fl L Ar class .Op Fl l Ar newname -.Op Fl m .Op Fl M Ar mode -.Op Fl k Ar dir -.Op Fl w Ar method +.Op Fl p Ar date .Op Fl s Ar shell -.Op Fl L Ar class -.Op Fl h Ar fd | Fl H Ar fd -.Op Fl N -.Op Fl P -.Op Fl Y +.Op Fl w Ar method .Nm .Op Fl R Ar rootdir .Op Fl V Ar etcdir .Cm usershow -.Oo Fl n Oc Ar name Ns | Ns Ar uid | Fl u Ar uid -.Op Fl F -.Op Fl P -.Op Fl 7 -.Op Fl a +.Oo Fl n Oc Ar name Ns | Ns Oo Fl u Oc Ar uid +.Op Fl 7aFP .Nm .Op Fl R Ar rootdir .Op Fl V Ar etcdir .Cm usernext -.Op Fl C Ar config .Op Fl q +.Op Fl C Ar config .Nm .Op Fl R Ar rootdir .Op Fl V Ar etcdir .Cm groupadd -.Oo Fl n Oc Ar name Oo Fl g Ar gid Oc +.Oo Fl n Oc Ar name +.Op Fl oNPqY .Op Fl C Ar config -.Op Fl q +.Op Fl g Ar gid +.Op Fl H Ar fd +.Op Fl h Ar fd .Op Fl M Ar members -.Op Fl o -.Op Fl h Ar fd | Fl H Ar fd -.Op Fl N -.Op Fl P -.Op Fl Y .Nm .Op Fl R Ar rootdir .Op Fl V Ar etcdir .Cm groupdel -.Oo Fl n Oc Ar name Ns | Ns Ar gid | Fl g Ar gid +.Oo Fl n Oc Ar name Ns | Ns Oo Fl g Oc Ar gid .Op Fl Y .Nm .Op Fl R Ar rootdir .Op Fl V Ar etcdir .Cm groupmod .Oo Fl n Oc Ar name Ns | Ns Ar gid Oo Fl g Ar newgid Oc | Fl g Ar gid +.Op Fl NPqY .Op Fl C Ar config -.Op Fl q +.Op Fl d Ar oldmembers +.Op Fl H Ar fd +.Op Fl h Ar fd .Op Fl l Ar newname .Op Fl M Ar members .Op Fl m Ar newmembers -.Op Fl d Ar oldmembers -.Op Fl h Ar fd | Fl H Ar fd -.Op Fl N -.Op Fl P -.Op Fl Y .Nm .Op Fl R Ar rootdir .Op Fl V Ar etcdir .Cm groupshow -.Oo Fl n Oc Ar name Ns | Ns Ar gid | Fl g Ar gid -.Op Fl F -.Op Fl P -.Op Fl a +.Oo Fl n Oc Ar name Ns | Ns Oo Fl g Oc Ar gid +.Op Fl aFP .Nm .Op Fl R Ar rootdir .Op Fl V Ar etcdir @@ -172,16 +156,16 @@ .Op Fl R Ar rootdir .Op Fl V Ar etcdir .Cm lock -.Oo Fl n Oc Ar name Ns | Ns Ar uid | Fl u Ar uid -.Op Fl C Ar config +.Oo Fl n Oc Ar name Ns | Ns Oo Fl u Oc Ar uid .Op Fl q +.Op Fl C Ar config .Nm .Op Fl R Ar rootdir .Op Fl V Ar etcdir .Cm unlock -.Oo Fl n Oc Ar name Ns | Ns Ar uid | Fl u Ar uid -.Op Fl C Ar config +.Oo Fl n Oc Ar name Ns | Ns Oo Fl u Oc Ar uid .Op Fl q +.Op Fl C Ar config .Sh DESCRIPTION The .Nm