Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 16 Sep 2025 13:59:08 GMT
From:      Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= <des@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: f6ff04831acf - stable/15 - uptime: Mention libxo support in manual page
Message-ID:  <202509161359.58GDx83v064388@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <des@FreeBSD.org>
AuthorDate: 2025-09-11 20:51:48 +0000
Commit:     Dag-Erling Smørgrav <des@FreeBSD.org>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202509161359.58GDx83v064388>