From nobody Sat Sep 24 08:00:39 2022 X-Original-To: dev-commits-src-branches@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 4MZLzq5BgYz4cl5W; Sat, 24 Sep 2022 08:00:39 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MZLzq4WVYz3cm0; Sat, 24 Sep 2022 08:00:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664006439; 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=C8w5TVaHmillS4+8V2FgOJD9XoGOUkujepAc9qu5Vz8=; b=X742I6BnZ9q135k6wqJZ0SQlT63wJJ/PeoQFNv/2blYTuq48im5yFrdE/8AJ4odxaHE0lG np/oVCqatK6sf4XxcESdIVfVn1CanKNEFUs+D0FLtK6BHbY7BjRFa76dKDzekq3SvNb+WU jdc7YDhTgnV3mCy8Ka89+vpr3zYtYN8inz8gaJXYIdTMC15RR0X28ETniQSH6ycAbDeC+8 EdWjN/bZKEF0CUAi4dusvoH0a+M2+fO8K00JWMOV9AD6IfNSggvgpsCYRlAOGBk8G5XAfK Ix3jlvzc60NTR+swpgbeFNEnA2ylRlvVVF9PaqL7PlGDKNozDu6kjWTiOH3PuQ== 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 4MZLzq3dg0z11tR; Sat, 24 Sep 2022 08:00:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28O80dj5011662; Sat, 24 Sep 2022 08:00:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28O80dEq011661; Sat, 24 Sep 2022 08:00:39 GMT (envelope-from git) Date: Sat, 24 Sep 2022 08:00:39 GMT Message-Id: <202209240800.28O80dEq011661@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 893f51161718 - stable/12 - uname.1: Clarify the -r option List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 893f5116171817998264d29dc3dd31325bcb8483 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664006439; 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=C8w5TVaHmillS4+8V2FgOJD9XoGOUkujepAc9qu5Vz8=; b=vYFJNArn5VFQXfFfmuFlYkpD+fq2imlqD4m9K6G3uh2f79DlZwk6S5A7PDAErb+fYR++qf i0G5qUQjnhxWcrWwi7TlZjzOzWIZ4vj1wjCY512StYTARXkMoCp+QUjmYr6Y5nbYvS04C2 sQO6ml8YI6HIKQHXVaPJ/teZnVZpOCu2c0OjNCws2ZAQIj6IbYMQ0zJM1z4STtx+ake6uX J4IZjCR1Sf3jTE4uQrpWtdXi5hOTlI/3sv/UFLOsc2Wg78jjYnGbdl1XOBJ7d2DKTVxa7x zUNmAwPzuJ4/p7JYwikpJpDVkD0QZi8BhygDjsKcAhnMQhRc7Ss6R6VBF2cbww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664006439; a=rsa-sha256; cv=none; b=xfbd4wf3Kz4vMd8+2/WGLeAK9vb2x5VCbqe7VJswhFFcs+MkIgf8IflS7djkSSjWZaN3W3 R5OKwh3t1J2b7GlJANbTuVIGSKXb77SXB9sMPCppNhJxS+Liwk/GaeAUKz8u5mjWhSHh8W xc0XOCW6mbiNLUco55yqTQgMvIPXsYzss19UlHHgtUgoltskEdX5IZAQ6uUEcJajX6bLqB GDj02eh/wWIei1ZlzaotvEdW22YWncFkhk3GV6QBcIusvaB/FJJXerk+7LZybSV29CEotN cSCpF6emSeL9G61l6lF3ALQhQblfOp9CWQYjRFP9kkltyglkyc9nfv2lzlkzfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N 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 AuthorDate: 2022-09-16 11:27:54 +0000 Commit: Gordon Bergling 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