From nobody Mon Sep 07 08:03:07 2026 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 4hdfhJ3XkFz6rfC9 for ; Mon, 07 Sep 2026 08:03:12 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hdfhJ2hMGz3y27 for ; Mon, 07 Sep 2026 08:03:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788768192; 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=eeLqrhNhst1uQ90XBQNaQNTH5C7eGKV4UfK0uZj/+38=; b=iZaE2/OYOw90DTmwoIaY3K4wjNVhX3OzQAvfG2guKB9Hc8CR0zkWnLtYajqdSG021e/b+o Xktb8zN2TeZA97VQnBqmRbxmCwCQcvzw1/eM0Uk0SjACMFWF+pOl93lnkvkxZNC3rdt0M5 DLYzBXsVHBtfA8yUqp6msUoW+gBxOUwWHuv2jeOR+ujKRIHovmd2FuN+09g0CRcfje7Tt2 nrD8fNjBblDLr2vF2xH+rB0rqLP33MD7z5+6hddAZ6GlPsw1CUu/QcbGkjlI1WAYDbTubN 53ZLryvGKg3rvwTVa63odP1o49myxVXHf4K0xDeXkKCUCkFjjTDyQP5KilEg/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788768192; a=rsa-sha256; cv=none; b=kHknz801LUllaVpPke/CN86P++ISuKw+oTOV/6MhLDS9fbQzcuUdTtP+mlw7FnWSG01MbL ArcEQdSneDE+x4FgKsugFWPyjVqDZKF5yOLdTudI1RPP9RbvFvsJkuUVOHA209EUr1MMf1 6HRrc7Nq5WscM5SoILd+mHtDebB1783t6knvHhO2bGw08M1KoILoOdxBHbWmlRtgO/RQp7 j3tYDlblK/xmZfXbY1cm5rhkc+cXFYWvd8xDSNzAAITMobO/eMw3E8IDPBmtVCvsMcbDMB +Gu6FSMEMarhIViAeQ9JpfZFI9ZVoRTZUrz7kAyop6ttzzamGLixYlOwQpoO5Q== 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=1788768192; 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=eeLqrhNhst1uQ90XBQNaQNTH5C7eGKV4UfK0uZj/+38=; b=fDpXdSEvza33Sa3SjsglFXN70SOyC6HAldEFfVYr5E8WKbPnCLWA/6HA1cML2V/Iq6AGac EmYM6LHfYkk2X782yBysE6wNAU3co0jVsjnCZtdvOagSyPGJI/StO+bMDKYOom+zYVqF42 HO8YqMrPHUk2SixTKGOSLc3E8LDbF8lQIWiR5FGtzn31qxsEiB4Rrw8n3hm7sKjMm4fHM8 139G+qTa2NCdjNDNNIrH166Y7ag4tUMZeUm34N7qa8NZbbcR/679k3jHZqWFZJua4qm75X Z36lRJ2uAps6AHGhAXagp3TI+m9ENNVMFUG1WDyGLi6ScPMgyy2+awjsKoDCKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hdfhJ1W6Gz18X3 for ; Mon, 07 Sep 2026 08:03:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c770 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 07 Sep 2026 08:03:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Devin Teske Subject: git: fb144a705792 - main - pw(8): Brace the name-or-id synopsis so it matches the code 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dteske X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb144a705792dcc154ad2f75dfa21fbda255913d Auto-Submitted: auto-generated Date: Mon, 07 Sep 2026 08:03:07 +0000 Message-Id: <6a9e6fbb.3c770.4aacba2e@gitrepo.freebsd.org> The branch main has been updated by dteske: URL: https://cgit.FreeBSD.org/src/commit/?id=fb144a705792dcc154ad2f75dfa21fbda255913d commit fb144a705792dcc154ad2f75dfa21fbda255913d Author: Devin Teske AuthorDate: 2026-09-07 08:00:47 +0000 Commit: Devin Teske CommitDate: 2026-09-07 08:00:47 +0000 pw(8): Brace the name-or-id synopsis so it matches the code An unbraced pipe list made -n look like it could take a uid (or gid). Use braces for a single choice of name or id, and keep -u newuid / -g newgid on the name invocation only. Drop the USER/GROUP OPTIONS sentences that said -n could be a numeric id. PR: 269193 MFC after: 3 days Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D59472 --- usr.sbin/pw/pw.8 | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/usr.sbin/pw/pw.8 b/usr.sbin/pw/pw.8 index 1498f76fd9c5..86901c0be4a5 100644 --- a/usr.sbin/pw/pw.8 +++ b/usr.sbin/pw/pw.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 19, 2026 +.Dd September 6, 2026 .Dt PW 8 .Os .Sh NAME @@ -75,14 +75,14 @@ .Op Fl R Ar rootdir .Op Fl V Ar etcdir .Cm userdel -.Oo Fl n Oc Ar name Ns | Ns Oo Fl u Oc Ar uid +.Bro Oo Fl n Oc Ar name | Oo Fl u Oc Ar uid Brc .Op Fl r .Op Fl Y Op Fl y Ar nispasswd .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 +.Bro Oo Fl n Oc Ar name Oo Fl u Ar newuid Oc | Oo Fl u Oc Ar uid Brc .Op Fl mNPq .Op Fl C Ar config .Op Fl c Ar comment @@ -104,7 +104,7 @@ .Op Fl R Ar rootdir .Op Fl V Ar etcdir .Cm usershow -.Oo Fl n Oc Ar name Ns | Ns Oo Fl u Oc Ar uid +.Bro Oo Fl n Oc Ar name | Oo Fl u Oc Ar uid Brc .Op Fl 7aFP .Nm .Op Fl R Ar rootdir @@ -127,13 +127,13 @@ .Op Fl R Ar rootdir .Op Fl V Ar etcdir .Cm groupdel -.Oo Fl n Oc Ar name Ns | Ns Oo Fl g Oc Ar gid +.Bro Oo Fl n Oc Ar name | Oo Fl g Oc Ar gid Brc .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 +.Bro Oo Fl n Oc Ar name Oo Fl g Ar newgid Oc | Oo Fl g Oc Ar gid Brc .Op Fl NPqY .Op Fl C Ar config .Op Fl d Ar oldmembers @@ -146,7 +146,7 @@ .Op Fl R Ar rootdir .Op Fl V Ar etcdir .Cm groupshow -.Oo Fl n Oc Ar name Ns | Ns Oo Fl g Oc Ar gid +.Bro Oo Fl n Oc Ar name | Oo Fl g Oc Ar gid Brc .Op Fl aFP .Nm .Op Fl R Ar rootdir @@ -158,14 +158,14 @@ .Op Fl R Ar rootdir .Op Fl V Ar etcdir .Cm lock -.Oo Fl n Oc Ar name Ns | Ns Oo Fl u Oc Ar uid +.Bro Oo Fl n Oc Ar name | Oo Fl u Oc Ar uid Brc .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 Oo Fl u Oc Ar uid +.Bro Oo Fl n Oc Ar name | Oo Fl u Oc Ar uid Brc .Op Fl q .Op Fl C Ar config .Sh DESCRIPTION @@ -322,10 +322,6 @@ Required unless .Fl u Ar uid is given. Specify the user/account name. -In the case of -.Cm usermod -can be a -.Ar uid . .It Fl u Ar uid Required if .Ar name @@ -835,9 +831,6 @@ Required unless .Fl g Ar gid is given. Specify the group name. -In the case of -.Cm groupmod -can be a gid. .It Fl g Ar gid Required if .Ar name