From nobody Tue Sep 16 13:59:18 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 4cR3RV3FXDz67JvJ; Tue, 16 Sep 2025 13:59:18 +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 4cR3RV1P1Nz3XLd; Tue, 16 Sep 2025 13:59:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031158; 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=wkZxPaLVgidQzFNNUA++07nMTD6Wnksn98Yi8MBvcmA=; b=lUYU7WjcxF9s7gX5J7QUZxw6mI5kXztvYZRlLG27AwNUXIUW6cK+ommhw3vdOv2RHOPfoS R/47ZKSuR8bgKbHT+lx5YI9i2sv+e5AbMmvyhAEdMjKQ/NWCWNGAtxpkatyF1wePsYu9Qq Y0kPZ5sLSdyuxVX9kBol10xTutNWSRpkAfXZ5P8h+YEcFYqGy3ufPCS92+mGoq0SoCqXbE gf62wPgLOYclNCesOlqrP2uv3dVF2Vw0o68fHFURdPl0pJ49TEVg/cpGcf+07cZj9p09SY TAmTZkk2TwBJrQ6WDUdVYl1QCE14dc3yXR99As4qeywmchFGC52hGNGo7gYQng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031158; 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=wkZxPaLVgidQzFNNUA++07nMTD6Wnksn98Yi8MBvcmA=; b=lprWWKeU+7YxaPT5PnFOw2TEpUfyJSGVTjyxtY2P3CJp9GymVIsCBlxQtIE0i/kMju6MKw R0kyum9OeAIZV7Wp7xQlnzGWkJrvt0dK0i4jeOrGJcY0Ev+pKOAjND1DkKVGky/ujJ0uvd KDiezhOJUWt48CEwnpqoVQJ5E2lSAnIlYlPHIAO6okeAs5oE6oN9YK+9HqwyZyeG5CJObP oWwHZLeFGbUu7q2H2SVBraR07QiTBAXHJkcM455ZpuF8RdoQ5TaX7nnflOzCecHaJHrTh1 IvywLr1KDUfVduExORyAN5y8BQKYidZNxDONfB/sHnEkSt4zRmi5sXa98x7Qxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758031158; a=rsa-sha256; cv=none; b=n/pIgDBpiOCtuCBt1exbY2zPsp0qcLzUtnrJSsubQc1c7iYKXGSbI+AA3vlCB61dZGsECG ZK/1khUgZzxMzgxqojy9tjNayPhBEV6op/NM8mZaRVc8F5aNCCA8Qt5xzUz8Ea3PTpaFMh ycXWEOVnf4IYwuncJpx9SQk7fHY3jCG2QFHNq2g6MBYbM7wvXDhSyywgthmIvQUSa0yc2c eDK4T2LsfG+rSn4+7Pmm2SVAw8JGHDLV6qgvKUFd2EVtUiVD59XaD7dl4cYPmXRm6csgYL oALpVtCeP9RSTrMJ8rdOyyF54OTp1VLLhUYYzKUNGysIKLxTSiZBIdbosBEyjg== 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 4cR3RV10xzzkBm; Tue, 16 Sep 2025 13:59:18 +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 58GDxILG064715; Tue, 16 Sep 2025 13:59:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GDxIBA064712; Tue, 16 Sep 2025 13:59:18 GMT (envelope-from git) Date: Tue, 16 Sep 2025 13:59:18 GMT Message-Id: <202509161359.58GDxIBA064712@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: 65ce9cefee56 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 65ce9cefee56a15c8361ee5d5154064e11d629a7 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=65ce9cefee56a15c8361ee5d5154064e11d629a7 commit 65ce9cefee56a15c8361ee5d5154064e11d629a7 Author: Dag-Erling Smørgrav AuthorDate: 2025-09-11 20:51:48 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-09-16 13:27:56 +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 16c16c0b5318..b20e9066a470 100644 --- a/usr.bin/w/uptime.1 +++ b/usr.bin/w/uptime.1 @@ -27,7 +27,7 @@ .\" .\" @(#)uptime.1 8.2 (Berkeley) 4/18/94 .\" -.Dd August 18, 2020 +.Dd September 11, 2025 .Dt UPTIME 1 .Os .Sh NAME @@ -35,6 +35,7 @@ .Nd show how long system has been running .Sh SYNOPSIS .Nm +.Op Fl -libxo .Sh DESCRIPTION The .Nm @@ -42,6 +43,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 @@ -53,7 +65,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 7f0d83032d4b..584c5d1b7129 100644 --- a/usr.bin/w/w.1 +++ b/usr.bin/w/w.1 @@ -27,7 +27,7 @@ .\" .\" @(#)w.1 8.1 (Berkeley) 6/6/93 .\" -.Dd August 24, 2020 +.Dd September 11, 2025 .Dt W 1 .Os .Sh NAME @@ -56,7 +56,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