From nobody Tue Sep 16 13:59:08 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 4cR3RK2TW5z67JfF; Tue, 16 Sep 2025 13:59:09 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cR3RK0SLQz3WkM; Tue, 16 Sep 2025 13:59:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031149; 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=v8EXMZ0dNRuBpqqNOayElFsGL6MLw21fAY5W0j80XBA=; b=YJA9t0tpy50TiStTlNtoP3wnob7j+MvYiY+AF0tC/RuAHDqT+D06yGFYzj5f86npQxChav rvcRHX9a1J6We13eteVhpaBJzVkW74Gtwd+g6qQ3NpaxKODFdgLqSEY9/3kGOq8m8aAPIV d7rNEQlSbmy+h95nMOPqP/t0CuKNUmpA+oAJz3I/ukyFBM/mIkj05/IwWxmemYpkaZVdXm Jj1xPlL9MX2W19pFjIwgGTT7cB0pbzOUD5ZcelgpFzTnBDsQNwn6wbssYduXkRdgItZ+a1 zgjsHoRSf6mVrdlqw1YLOT922RzgwyrGdLgEPz/LQlh99kPYAd2XhEubWv6TdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031149; 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=v8EXMZ0dNRuBpqqNOayElFsGL6MLw21fAY5W0j80XBA=; b=F7oWnNqL6bhjMlTf5QfEZAAfYys49Q34gyDy4LjFL3S/VSCVg1s81KDzcH5/v4QHW3BpiX 6ePgkzowL0w7Z2nLqsZys0nemDB9PPy8iypJpKMNDnUWE2TjgnqDlJdOaU1w38yKQAEGvl oGE+30ijXtNIzF8DjxecadVBoM67XuYg+BgBp6O1Iv3j9wFGpFl0Qyg8cwAV/Bq6ezfpx/ vhd4XPL0cg57bYW6EjnDqiNMa93Ppb8DX9bo+ohwtIDC7tUX+o1Kwg49FwtgzU1XxaU3/d 1QN6NzooXd9ER7K5Wz0NhhZeYrnw8Vz5Bl9HJZzwwlwt7ZvuwkZZ2Qs96LnV2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758031149; a=rsa-sha256; cv=none; b=AqSwEEhMF6ptdDBrGOcT9mFrF7uR3NNAOC0FsIOHfXQvbELpQL+npJgqqVKxEG05WiKP4z uDPI1okH/qIzuKjFzr/q6sDeU+wcXIh/f13G7Z+kbJXjcql4W9mLgjUwrSPDQIcTU5PBHm H1kpH08lecqqitD8kX/6o6IQDOpPDYXXBfB0LJB1OoZb5ac4Jtgqws+IJgidauMJElBAiZ 3nQIeCUw4auoNC23z6r1fng+RXBNs6WOcONBfD7uLALekpheRbiU39hdn6y4NoHM9FGbR/ PzEgS1SvHYWuLFmgNRZIeegPhesqouzWwJLmi08l9w8YPqLHiPHzJP8DmLCqrw== 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 4cR3RK00pvzkfV; Tue, 16 Sep 2025 13:59:09 +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 58GDx8NI064391; Tue, 16 Sep 2025 13:59:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GDx83v064388; Tue, 16 Sep 2025 13:59:08 GMT (envelope-from git) Date: Tue, 16 Sep 2025 13:59:08 GMT Message-Id: <202509161359.58GDx83v064388@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: f6ff04831acf - stable/15 - uptime: Mention libxo support in manual 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f6ff04831acf4b3ae693afb96a090e4a0c3803ab Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f6ff04831acf4b3ae693afb96a090e4a0c3803ab commit f6ff04831acf4b3ae693afb96a090e4a0c3803ab Author: Dag-Erling Smørgrav AuthorDate: 2025-09-11 20:51:48 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-09-16 13:27:45 +0000 uptime: Mention libxo support in manual page MFC after: 3 days Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D52489 (cherry picked from commit 55bd607b9930e5f61219007ad0a81801c8cfdbf3) --- usr.bin/w/uptime.1 | 18 ++++++++++++++++-- usr.bin/w/w.1 | 4 ++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/usr.bin/w/uptime.1 b/usr.bin/w/uptime.1 index b93972d3f932..37881793736f 100644 --- a/usr.bin/w/uptime.1 +++ b/usr.bin/w/uptime.1 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 18, 2020 +.Dd September 11, 2025 .Dt UPTIME 1 .Os .Sh NAME @@ -33,6 +33,7 @@ .Nd show how long system has been running .Sh SYNOPSIS .Nm +.Op Fl -libxo .Sh DESCRIPTION The .Nm @@ -40,6 +41,17 @@ utility displays the current time, the length of time the system has been up, the number of users, and the load average of the system over the last 1, 5, and 15 minutes. +.Pp +The following options are available: +.Bl -tag -width indent +.It Fl -libxo +Generate output via +.Xr libxo 3 +in a selection of different human and machine readable formats. +See +.Xr xo_options 7 +for details on command line arguments. +.El .Sh FILES .Bl -tag -width /boot/kernel/kernel .It Pa /boot/kernel/kernel @@ -51,7 +63,9 @@ $ uptime 11:23AM up 3:01, 8 users, load averages: 21.09, 15.43, 12.79 .Ed .Sh SEE ALSO -.Xr w 1 +.Xr w 1 , +.Xr libxo 3 , +.Xr xo_options 7 .Sh HISTORY The .Nm diff --git a/usr.bin/w/w.1 b/usr.bin/w/w.1 index 159eb3370c8c..2dbcffdeda1f 100644 --- a/usr.bin/w/w.1 +++ b/usr.bin/w/w.1 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 16, 2025 +.Dd September 11, 2025 .Dt W 1 .Os .Sh NAME @@ -54,7 +54,7 @@ user is on, the host from which the user is logged in, the time the user logged on, the time since the user last typed anything, and the name and arguments of the current process. .Pp -The options are as follows: +The following options are available: .Bl -tag -width indent .It Fl -libxo Generate output via