From nobody Fri Jan 24 15:50:35 2025 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 4Yfj2M39Wrz5lZV5; Fri, 24 Jan 2025 15:50:35 +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 4Yfj2M2bgKz46ZJ; Fri, 24 Jan 2025 15:50:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737733835; 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=8Hli9L2VaFN1VQu3ZGsd9nYK8CcoRm3/CAl2+1uEcIc=; b=gtMujfxHukwxxmampH9Iej5dhh2cTYE5k4PCeiG64whGItAcGjmAthoNV9r142CLGJTOve WLNL8k38tECTu+4x7m2yzaDZmi71Gn8B1jWSvVaWGqpZ8gYYLSr4TXUca+XxRMnjQsBbeU BiIw3WbcuC6+mxnbW9fF7O8kPnpjA5uF8Me6oM/dDvZPni1FF6XfbDZbzVdC9N2YlQFxkR 0ZLiJ8U7g/A8+7C+FWokt5NVzcEQ1u/Pc8uNVVORunaBNZGdyR0yC8g/tqCIih3Ybg8Lhs mJ/H++ygYE7kyhv9YTSMKyEbt3VrEd06Gq83b+6p8mAq2AbmhztgBG3PeiPakQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737733835; 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=8Hli9L2VaFN1VQu3ZGsd9nYK8CcoRm3/CAl2+1uEcIc=; b=oaUjR4KdaKqZhU7lzUxK7MskTBn8FWT7P8vcHvJpl7LXoUJoEFa8EQTFms1LCUZ/6q0FHU YqsBq1l6x8blxe5S+8tZxJwXfEaZKr7LzmEbEQmIlp0OLAbho27y6iofreZJ7xiWk0TJak +4gcPLNJKJwyj/t8la3azFg2lb0ikqbY6a2BbNe9mZCyuwbwez+LqDGDo3Ve3/vE/zicYS +u0Zv041AdJGjfc/mQvQOpFIDE19SdC1oIfgNa4ZaSRV4GHNV0X4BM8PmcbV52a1qKkd4w A8gib04BP7DH/WFdUfFbAPJQqXu3gYOyDGiTPyvG745fLG5LYpS0kjA9RpKmaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737733835; a=rsa-sha256; cv=none; b=iBF1Id4yaH/o3lPWF9cjXLVFVC+u+i/iffTY19kv8xu1KS7rPHt04IxWQiGYX+7RsnIc12 UC3HMvTDOnp1/Pi5hHkydA7aOdI/wAPmHJs2FUSy6LI4gB9VUlwO2OXzXbYh8o7K7ImQ6q S5+uD7GK5DMWiH24Fso1UJ6lkSva+jVp7bkYEJMqNpaRKIXyfJSiteFo/0N8GsLIG1ebL2 OLxvcBVQ3FK2CymBEcYJNQQFe0ne1HqWC976Q5bTGVxOVNmLna4cT7EGFJUQCCiCDcZm1P zA9Ft8iYHVpCwayXAXkBY2SG9lcKN7GfCnF27Rbc9RR08ZVbHYcCp2t45vF4eQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yfj2M24lwzXVB; Fri, 24 Jan 2025 15:50:35 +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 50OFoZYK048332; Fri, 24 Jan 2025 15:50:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50OFoZIr048330; Fri, 24 Jan 2025 15:50:35 GMT (envelope-from git) Date: Fri, 24 Jan 2025 15:50:35 GMT Message-Id: <202501241550.50OFoZIr048330@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 1d890d546b06 - stable/14 - sysctl: Fix usage() and SYNOPSIS section of man page 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1d890d546b064f2c7753b949f5dbf00d79cde292 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=1d890d546b064f2c7753b949f5dbf00d79cde292 commit 1d890d546b064f2c7753b949f5dbf00d79cde292 Author: Zhenlei Huang AuthorDate: 2025-01-23 07:24:15 +0000 Commit: Zhenlei Huang CommitDate: 2025-01-24 15:49:33 +0000 sysctl: Fix usage() and SYNOPSIS section of man page I forgot to update the usage() and SYNOPSIS section of man page when adding the two options -J and -V. While here, fix the options sort order in SYNOPSIS section. Fixes: 5ec83c660aca sysctl: Add flags to filter jail prison and vnet variables MFC after: 1 day (cherry picked from commit 0ee3e29e1d9ee3ed22441c0d580d2d1e57a1d9e3) --- sbin/sysctl/sysctl.8 | 6 +++--- sbin/sysctl/sysctl.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8 index fadc162b80c6..da4dec6be005 100644 --- a/sbin/sysctl/sysctl.8 +++ b/sbin/sysctl/sysctl.8 @@ -30,7 +30,7 @@ .\" .\" From: @(#)sysctl.8 8.1 (Berkeley) 6/6/93 .\" -.Dd October 29, 2024 +.Dd January 23, 2025 .Dt SYSCTL 8 .Os .Sh NAME @@ -38,13 +38,13 @@ .Nd get or set kernel state .Sh SYNOPSIS .Nm -.Op Fl bdeFhilNnoTtqWx +.Op Fl bdeFhiJlNnoqTtVWx .Op Fl B Ar bufsize .Op Fl f Ar filename .Ar name Ns Op = Ns Ar value Ns Op , Ns Ar value .Ar ... .Nm -.Op Fl bdeFhlNnoTtqWx +.Op Fl bdeFhJlNnoqTtVWx .Op Fl B Ar bufsize .Fl a .Sh DESCRIPTION diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c index 8ec9089bd2cf..df9b453d52a0 100644 --- a/sbin/sysctl/sysctl.c +++ b/sbin/sysctl/sysctl.c @@ -122,8 +122,8 @@ usage(void) { (void)fprintf(stderr, "%s\n%s\n", - "usage: sysctl [-bdeFhilNnoqTtWx] [ -B ] [-f filename] name[=value] ...", - " sysctl [-bdeFhlNnoqTtWx] [ -B ] -a"); + "usage: sysctl [-bdeFhiJlNnoqTtVWx] [ -B ] [-f filename] name[=value] ...", + " sysctl [-bdeFhJlNnoqTtVWx] [ -B ] -a"); exit(1); }