From nobody Thu Nov 13 02:38:45 2025 X-Original-To: dev-commits-src-all@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 4d6PbT2yQZz6H19Y; Thu, 13 Nov 2025 02:38:45 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d6PbT2R5Vz3Y6K; Thu, 13 Nov 2025 02:38:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763001525; 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=R2sL4kt6XauMYabRbKuJSYi8Al9pScflQCyymKZqgUM=; b=gFuiYRNx1zQr+hjJNVQpq1gBOY+BY3aMQXrQZBECcazED9/HmQkS9/XRzb87P/kcKmngZj g7KY+39tiwLGg5+qYLR1jNDm3ML8olnQsZWBKu9uMXRtbJCaYbJZwWsV321Cmaq0qs1XoV KZmrQpF5lqtJWNzIs0dkypdZ7tBYFJjyccFa6kykysctDX0CAH+4f8NowsBCIV6b0tMFjP iofblWstdr0BQRAdLUY1j39KhPZK/sg17vUiD4gW5aHBio0AU6QKj0NVoVOoSy10J2Jdgk Wmd1GxVw62tvABlBg9qgmxHP50XXdpLwDEDq2bcjfYk3tZD5EdlwTQ9wJ91R0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763001525; 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=R2sL4kt6XauMYabRbKuJSYi8Al9pScflQCyymKZqgUM=; b=UO5jFPqmiwHPAK+slT8Zwm8+hrDStE1JPbo+hNuULgJR9ozQLsdf6eV7FZO9k/VQag92MQ IOlp4PKvQUVd7PRY1IDOS6nix6N2yqSMXDTB8l5PkCS7Gh4/6HfbZ0gR8xAWCoGmlMpzC0 cvHIWlREdNVwMV/ph/1RqUsEN336p+jLnI1kqc+W9SXE2m+qvM3aliX7B3lNL+1+egkTv5 Y/lkigl7HhiRv0R7rBHbiSgH2aNPQpfIc1KNikly5jTDPbRLmx6B8K+yZnnNKx4pYCPD0u v2iU+voKolCR78Hvo6eaRIoOQEXgXvIoN33/G22z2QD0whXNre7vr/7rKXGIQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763001525; a=rsa-sha256; cv=none; b=ecGrtsPEqruuQP3FcCXm6veCUGDREZ5p0tYBNIZTHRjHQHaWDUVdlC1Br8UVDjrn0DqSR1 wH3Owh0nhEKa3B8tsuWhhkaJx/ttGB0mjOvbNmjNQR6g0sY2B6ZetidUe579fJ7A8R05cG rru+UVkYkPo1Q2YePe57/8+zN2Qr2FPmUol4lq1Qk6vz7iDoaq+ERAvyZfGspPNM/QGGND aE3A3o0oYFTGfXaRvgGUCc3S4ke3Nt8BGRLF9uOmWHP7xIeH/vV+XLOu8qulQ2RMEIauHs JUKeBZabMY32LaaEDIZ8dfgvrEygiJ5Fb+fMpzUW72Fl/O0mBvULDROQq7LP8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4d6PbT1mpwz11lX; Thu, 13 Nov 2025 02:38:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AD2cj58088905; Thu, 13 Nov 2025 02:38:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AD2cjTP088902; Thu, 13 Nov 2025 02:38:45 GMT (envelope-from git) Date: Thu, 13 Nov 2025 02:38:45 GMT Message-Id: <202511130238.5AD2cjTP088902@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: daa1f9b415f3 - main - apm(8): Drop MLINK to apmconf(8) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: daa1f9b415f3bca82cc7a6e555c9c56e1b1c44f5 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=daa1f9b415f3bca82cc7a6e555c9c56e1b1c44f5 commit daa1f9b415f3bca82cc7a6e555c9c56e1b1c44f5 Author: John Baldwin AuthorDate: 2025-11-13 02:36:14 +0000 Commit: John Baldwin CommitDate: 2025-11-13 02:38:35 +0000 apm(8): Drop MLINK to apmconf(8) apmconf(8) was merged into apm(8) back in 2000 and this note and MLINK were added as a transition aid, but that aid is no longer needed. --- ObsoleteFiles.inc | 3 +++ usr.sbin/apm/Makefile | 1 - usr.sbin/apm/apm.8 | 9 +-------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 1654ee06941f..6ce096ac92d1 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20251112: Remove old MLINK to apmconf(8) +OLD_FILES+=share/man/man8/apmconf.8.gz + # 20251112: Remove pccard(4) and related OLD_FILES+=share/man/man4/pccard.4.gz OLD_FILES+=share/man/man4/pcic.4.gz diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile index f6c42194401f..f9b3e11d22fa 100644 --- a/usr.sbin/apm/Makefile +++ b/usr.sbin/apm/Makefile @@ -1,6 +1,5 @@ PROG= apm MAN= apm.8 -MLINKS= apm.8 apmconf.8 MANSUBDIR= /${MACHINE_CPUARCH} PACKAGE=apm diff --git a/usr.sbin/apm/apm.8 b/usr.sbin/apm/apm.8 index d6ede22066da..e295ec989a73 100644 --- a/usr.sbin/apm/apm.8 +++ b/usr.sbin/apm/apm.8 @@ -9,7 +9,7 @@ .\" the author assume any responsibility for damages incurred with its .\" use. .\" -.Dd December 22, 2009 +.Dd November 12, 2025 .Dt APM 8 i386 .Os .Sh NAME @@ -120,13 +120,6 @@ If no options are specified, displays information and current status of APM in verbose mode. If multiple display options are given, the values are displayed one per line in the order given here. -.Sh NOTES -.Xr apmconf 8 -has been merged in -.Nm -and thus -.Nm -replaces all of its functionality. .Sh SEE ALSO .Xr apm 4 , .Xr zzz 8