From nobody Mon Apr 13 20:02:59 2026 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 4fvdcg2thbz6ZdrD for ; Mon, 13 Apr 2026 20:02:59 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvdcg2Bjyz3t3j for ; Mon, 13 Apr 2026 20:02:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776110579; 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=NZDJJMsGSG1Ph3WLXl3TZScEFTLbp6ZXgRF5xeCUhz8=; b=PlevAygPbQab2yyRY5iLuL1qtHfiJLYRHHgtV79JBpJSd5XYJfw9uHHbi2md1RCWtXeV4L CXFqMUnVmz+9DCJc5LNHwyMaI/QPsdwBbR9msMg69e0mPU6ctWQ0USuWgSaewCkxukU6Lz QJxaeJRNaWvNkfUtiUi4bIw+JtZo/KiK64uIzOEq5Zu7lGl1/npKJavaYvBj27iZ9qpe80 ndd56FwzX3i/7Ybd7EfY65NcM0g6FnADkeLro5nmh/jS58SRMQIrMrE89HBfYpKThhNWll 1jXglNaGnb6N22fMJUmrwuFicpBTVaVS1VUQ0BY9y2jzsLkjUbQnrsk9L+jvfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776110579; a=rsa-sha256; cv=none; b=heoShIBmin7YRdfaRSZJTHTX/br/UTOFmgpsJ8WnNM687LoXFDsbwdeQtmoXZiichzN1pI 8zx51/mYxaYSHsmCLCEk0nB2unwQfNKQUdf/9dhT2slfyRurOHCbr+ZZzxwMLlG6nBDXz1 AvhPlQlHHahNbtzXsojOlszFBagW5Bxc6lGIejRmVpnWMsOpITNdJfTdyvfZT3SsUe20UT k9unmMXs+emJrxO7APs9vGoqAh5q2qd/iinWhR2UmxPGLIj8orIuRFucCC8EnbiIowqzkK 04iCnW129RD3tLn5GC2g+25GeWAOnjmAXWon3Oadg6wthfgKaWqN4IuURKzDFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776110579; 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=NZDJJMsGSG1Ph3WLXl3TZScEFTLbp6ZXgRF5xeCUhz8=; b=rdzd7SN9/sBGHUM97JtwocL7Ns7nKooCSnu3RmWa9nLu8yrhtA+yrKxg8JiUWhIy0ecqyO X/VzTPG3b9yljUG51sd0NF4c3yPdbMvESUpSEs2xjZK+dDAqpch3DIqeIUhM9LngybtGqb B3/mRggBxR+JA4IhyVXKr6lNFc+qTQTTFYBquJCU7fHDQ1xRqXcoByp66VLdF7MjHBuTl+ asUpAkMGK7ayTwvhy5mYMLazu1/u/FtVECqfYXeKT07dXdfYQz0Vy65ut8H5BS/p6vE2++ 6I8gPCNa5YUh1e5yJKcoUrFdiSdVVsRe8tLw37C9V3Nblbm5D8/5E5OqDwSaJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvdcg1l04z3DY for ; Mon, 13 Apr 2026 20:02:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42e48 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 20:02:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 07b00bed8312 - stable/15 - manuals: System message vs kernel message 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 07b00bed83121043ffc88889edc15aad183227ba Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 20:02:59 +0000 Message-Id: <69dd4bf3.42e48.ca13288@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=07b00bed83121043ffc88889edc15aad183227ba commit 07b00bed83121043ffc88889edc15aad183227ba Author: Alexander Ziaee AuthorDate: 2026-03-08 07:23:17 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-13 20:02:32 +0000 manuals: System message vs kernel message Wordsmith mentions throughout the manual of syslog and dmesg, to clearly differentiate them in an externally consisteny way, increasing operator onboarding speed and elegance. The daemon that handles general system messages, syslog, describes them as "system messages", and "messages" is the standard filename. Rewrite syslog related manual titles to align search results with this, and hier entries to align the index. Use care to maintain keywords and not add extra lines. Newsyslog trades "maintain" with "rotate" for visibility. MFC after: 3 days (resolved newsyslog.8 merge conflict) Reviewed by: markj Closes: https://github.com/freebsd/freebsd-src/pull/2067 (cherry picked from commit 04d58d529a61f3bba2c1a843bc2793923a005759) --- lib/libc/gen/syslog.3 | 4 ++-- sbin/dmesg/dmesg.8 | 6 +++--- share/man/man7/hier.7 | 6 +++--- usr.sbin/newsyslog/newsyslog.8 | 4 ++-- usr.sbin/newsyslog/newsyslog.conf.5 | 6 ++---- usr.sbin/syslogd/syslog.conf.5 | 6 ++---- 6 files changed, 14 insertions(+), 18 deletions(-) diff --git a/lib/libc/gen/syslog.3 b/lib/libc/gen/syslog.3 index 62140554f4f5..1e316c20d8d8 100644 --- a/lib/libc/gen/syslog.3 +++ b/lib/libc/gen/syslog.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 3, 2023 +.Dd March 8, 2026 .Dt SYSLOG 3 .Os .Sh NAME @@ -34,7 +34,7 @@ .Nm openlog , .Nm closelog , .Nm setlogmask -.Nd control system log +.Nd control system message log .Sh LIBRARY .Lb libc .Sh SYNOPSIS diff --git a/sbin/dmesg/dmesg.8 b/sbin/dmesg/dmesg.8 index f9b9fce82ffc..d84587b61475 100644 --- a/sbin/dmesg/dmesg.8 +++ b/sbin/dmesg/dmesg.8 @@ -25,12 +25,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 7, 2022 +.Dd March 7, 2026 .Dt DMESG 8 .Os .Sh NAME .Nm dmesg -.Nd "display the system message buffer" +.Nd display the kernel message buffer .Sh SYNOPSIS .Nm .Op Fl ac @@ -38,7 +38,7 @@ .Sh DESCRIPTION The .Nm -utility displays the contents of the system message buffer. +utility displays the contents of the kernel message buffer. If the .Fl M option is not specified, the buffer is read from the currently running kernel diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index c438511678d4..d4b8c0019b81 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -327,7 +327,7 @@ Explicitly distrusted certificates; see kernel state defaults; see .Xr sysctl.conf 5 .It Pa syslog.conf -system log configuration +system message log configuration .It Pa ttys tty creation configuration; see .Xr getty 8 @@ -851,7 +851,7 @@ default log for system daemons .It Pa devd.log default log for device state change daemon .It Pa dmesg.today -system message buffer log, rotates to +kernel message buffer log, rotates to .Pa dmesg.yesterday .It Pa debug.log undiscarded debug syslog messages @@ -862,7 +862,7 @@ logs for the line printer spooler daemon; see .Xr sendmail 8 log, rotates and compresses to maillog.0.bz2 .It Pa messages -general system log; see +general system message log; see .Xr syslogd 8 .It Pa mount.today currently loaded diff --git a/usr.sbin/newsyslog/newsyslog.8 b/usr.sbin/newsyslog/newsyslog.8 index 7429e3b8eb01..fd389ccdbac0 100644 --- a/usr.sbin/newsyslog/newsyslog.8 +++ b/usr.sbin/newsyslog/newsyslog.8 @@ -14,12 +14,12 @@ .\" the suitability of this software for any purpose. It is .\" provided "as is" without express or implied warranty. .\" -.Dd September 1, 2025 +.Dd March 8, 2026 .Dt NEWSYSLOG 8 .Os .Sh NAME .Nm newsyslog -.Nd maintain system log files to manageable sizes +.Nd rotate system message log files to maintain manageable sizes .Sh SYNOPSIS .Nm .Op Fl CFNPnrsv diff --git a/usr.sbin/newsyslog/newsyslog.conf.5 b/usr.sbin/newsyslog/newsyslog.conf.5 index a6c0e75b209d..be146c6d5081 100644 --- a/usr.sbin/newsyslog/newsyslog.conf.5 +++ b/usr.sbin/newsyslog/newsyslog.conf.5 @@ -18,14 +18,12 @@ .\" the suitability of this software for any purpose. It is .\" provided "as is" without express or implied warranty. .\" -.Dd February 4, 2026 +.Dd March 8, 2026 .Dt NEWSYSLOG.CONF 5 .Os .Sh NAME .Nm newsyslog.conf -.Nd -.Xr newsyslog 8 -configuration file +.Nd system message log rotator configuration file .Sh DESCRIPTION The .Nm diff --git a/usr.sbin/syslogd/syslog.conf.5 b/usr.sbin/syslogd/syslog.conf.5 index 691f2cdd7062..f641aedee3e5 100644 --- a/usr.sbin/syslogd/syslog.conf.5 +++ b/usr.sbin/syslogd/syslog.conf.5 @@ -25,14 +25,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 10, 2020 +.Dd March 8, 2026 .Dt SYSLOG.CONF 5 .Os .Sh NAME .Nm syslog.conf -.Nd -.Xr syslogd 8 -configuration file +.Nd syslogd system message log configuration file .Sh DESCRIPTION The .Nm