Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 24 Sep 2022 08:00:39 GMT
From:      Gordon Bergling <gbe@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 893f51161718 - stable/12 - uname.1: Clarify the -r option
Message-ID:  <202209240800.28O80dEq011661@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by gbe (doc committer):

URL: https://cgit.FreeBSD.org/src/commit/?id=893f5116171817998264d29dc3dd31325bcb8483

commit 893f5116171817998264d29dc3dd31325bcb8483
Author:     Gordon Bergling <gbe@FreeBSD.org>
AuthorDate: 2022-09-16 11:27:54 +0000
Commit:     Gordon Bergling <gbe@FreeBSD.org>
CommitDate: 2022-09-24 08:00:19 +0000

    uname.1: Clarify the -r option
    
    It is some times hard to understand the difference between
    kernel version and userland version. So clarify the -r option
    of uname(1) in terms of a printed kernel version.
    
    While here, add some cross references:
    
    - cross reference freebsd-version(1) in uname(1)
    - cross reference freebsd-version(1) and uname(1) in freebsd-update(8)
    
    PR:             265594
    Reported by:    rwatson
    Reviewed by:    gbe, imp
    Differential Revision:  https://reviews.freebsd.org/D36516
    
    (cherry picked from commit 8f98a937ed726399b89e87e95769a9adc809281a)
---
 usr.bin/uname/uname.1                    | 7 +++++--
 usr.sbin/freebsd-update/freebsd-update.8 | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/usr.bin/uname/uname.1 b/usr.bin/uname/uname.1
index fb238bc01004..e6b3045ed0ce 100644
--- a/usr.bin/uname/uname.1
+++ b/usr.bin/uname/uname.1
@@ -28,7 +28,7 @@
 .\"	@(#)uname.1	8.3 (Berkeley) 4/8/94
 .\" $FreeBSD$
 .\"
-.Dd November 13, 2020
+.Dd September 14, 2022
 .Dt UNAME 1
 .Os
 .Sh NAME
@@ -80,8 +80,10 @@ uses it to set the
 variable.
 .Pc
 .It Fl r
-Write the current release level of the operating system
+Write the current release level of the kernel
 to standard output.
+.Xr freebsd-version 1
+can be used to print the release level of the userland.
 .It Fl s
 Write the name of the operating system implementation to standard output.
 .It Fl U
@@ -133,6 +135,7 @@ and
 would return
 .Va powerpc64 .
 .Sh SEE ALSO
+.Xr freebsd-version 1 ,
 .Xr feature_present 3 ,
 .Xr getosreldate 3 ,
 .Xr sysctl 3 ,
diff --git a/usr.sbin/freebsd-update/freebsd-update.8 b/usr.sbin/freebsd-update/freebsd-update.8
index 6d7fc792c6f1..3b56d64660a2 100644
--- a/usr.sbin/freebsd-update/freebsd-update.8
+++ b/usr.sbin/freebsd-update/freebsd-update.8
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 22, 2022
+.Dd September 10, 2022
 .Dt FREEBSD-UPDATE 8
 .Os
 .Sh NAME
@@ -256,6 +256,8 @@ Default location where
 stores temporary files and downloaded updates.
 .El
 .Sh SEE ALSO
+.Xr freebsd-version 1 ,
+.Xr uname 1 ,
 .Xr freebsd-update.conf 5 ,
 .Xr nextboot 8
 .Sh AUTHORS



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