From nobody Thu Apr 16 06:06:28 2026 X-Original-To: dev-commits-src-main@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 4fx6w54Xg1z6Z01G for ; Thu, 16 Apr 2026 06:06:29 +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 4fx6w458rkz3jZw for ; Thu, 16 Apr 2026 06:06:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776319588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5BT+mKleLFWXE9Fiz5jrDVvCYrY/PcL7om4S4RPzSV8=; b=W/nnWx1BkwjP15fAU+eFjZ829POnRTpqLONGKmtb6NdChYksanaytF71qgJnXCVpUsX6YL Hri4H5CKc2jeaULozygb+dkKnZIMPNQ8VkTsw0sHgflXf5rxy4yNGyhzlNu5hA+DFCez39 U3q2LcvZt2vl/KWdSI6k5Zg6CQ+YySyV3mrYCnPm58o53VadU9/cY/ByqdKEmjY3fg4QWK V/gPoHUFgxaRBmV5QtV5YISlnrA2+AnSWg3XIGC/GION63YLJ2L3Ef6c0DJ+PvTibNJ+LK AcxzDTt+YHcQe4etorLNk54VtD/TETwoOvA+5UlU/v5mj5RqlPgtfY1uI8XSGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776319588; a=rsa-sha256; cv=none; b=dDRvnFTo8TJB+j2zn/BtAYvEudjQ36voRJZAgXnxNfE8pffSIrfxq//Hy8hBhFIiFUQbMo eIXoX5LFSvBGGdv49pvfexBzElripH20OP3XM++sZy8dw1ao8lrZDVjINYJ1yYagHP3MKA LQlWwX5dS9Dxsy3NME78EvZnhqQmyPDjUk1O4Rc9wSU/CRluXBccd1HvfwII5qqXPsVW6I Wea0o82Y3bZwDLLDmVYy0kktDwjBS1D+697cNuLwT8nKeUIj0zU7c+uQQ/q/uRa+nl+WUY Ixisf+pBDJ9x1+wa1Xwsrcwu8eMyK/Xobqj5FQ43OALqrBhPIQ1JXQScyjhYhA== 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=1776319588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5BT+mKleLFWXE9Fiz5jrDVvCYrY/PcL7om4S4RPzSV8=; b=xhW2ltt5m8R8QpffQM6wU9WJWu+pB9iEHPkNQrmZwsVAUWWbNSEijfZkd23Oax6Gm9piOb DGgDGfiyj97K/W1vd29v88QjJtgYTTlXnKuZNjOcmdL2TND/kmsyd6OiAzfRFe8c2vuydw c8r13sgA0d0rZPXM4NvU+h0IgEs9LuLxOQRKjr7u2j3p4NlA/kKt6MR6+ghj1HQ4pkXDdy kn3UTJpglQg7BZ4mQh+g0T2BzH7U/J9YLARYUn//S3xOZgkq/ZLexBfh1K0hXJeioRKrjX ekAJK2bhB/MOx14+pi+ZYZB2Y5P2rvhqch2JkYXg32v9uJWnEKotuxO6ZPvylA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fx6w44Tmvzvgf for ; Thu, 16 Apr 2026 06:06:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b0f5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 06:06:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Kit Dallege From: Warner Losh Subject: git: e0b22342f52b - main - newsyslog.conf(5): use "rotated" instead of "trimmed" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e0b22342f52b22b1762b09ab16bbc520cf0f2882 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 06:06:28 +0000 Message-Id: <69e07c64.3b0f5.28715640@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e0b22342f52b22b1762b09ab16bbc520cf0f2882 commit e0b22342f52b22b1762b09ab16bbc520cf0f2882 Author: Kit Dallege AuthorDate: 2026-03-27 04:25:35 +0000 Commit: Warner Losh CommitDate: 2026-04-16 06:05:20 +0000 newsyslog.conf(5): use "rotated" instead of "trimmed" The man page used "trimmed" to describe log rotation, which is misleading as it suggests the file is truncated to a specific size rather than being rotated (renamed and a new file created). Replace all instances of "trimmed" with "rotated" to match the actual behavior and the terminology used elsewhere in the page. PR: 278671 Signed-off-by: Kit Dallege Reviewed by: imp,ziaee Pull Request: https://github.com/freebsd/freebsd-src/pull/2099 --- usr.sbin/newsyslog/newsyslog.conf.5 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/usr.sbin/newsyslog/newsyslog.conf.5 b/usr.sbin/newsyslog/newsyslog.conf.5 index 1683a1018f9e..b26df4bb1a61 100644 --- a/usr.sbin/newsyslog/newsyslog.conf.5 +++ b/usr.sbin/newsyslog/newsyslog.conf.5 @@ -18,7 +18,7 @@ .\" the suitability of this software for any purpose. It is .\" provided "as is" without express or implied warranty. .\" -.Dd March 8, 2026 +.Dd April 15, 2026 .Dt NEWSYSLOG.CONF 5 .Os .Sh NAME @@ -155,10 +155,10 @@ When the size of the log file reaches .Ar size , in kilobytes by default, or with suffixes like k, M, G, ... as supported by .Xr expand_number 3 , -the log file will be trimmed as described above. +the log file will be rotated. If this field contains an asterisk .Pq Ql * , -the log file will not be trimmed based on size. +the log file will not be rotated based on size. .It Ar when The .Ar when @@ -183,10 +183,10 @@ Additionally, the format may also be constructed with a sign along with a rotation time specification of once a day, once a week, or once a month. .Pp -Time based trimming happens only if +Time based rotation happens only if .Xr newsyslog 8 is run within one hour of the specified time. -If an interval is specified, the log file will be trimmed if that many +If an interval is specified, the log file will be rotated if that many hours have passed since the last rotation. When both a time and an interval are specified then both conditions must be satisfied for the rotation to