From nobody Thu Dec 18 22:57:56 2025 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 4dXR045gkKz6LywZ for ; Thu, 18 Dec 2025 22:57:56 +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 4dXR042T00z3r4x for ; Thu, 18 Dec 2025 22:57:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766098676; 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=3J8nGQzyyZDNKT2EiTTukYFTnufY3i1D/52AlFVDuC4=; b=IeawvM7ltYD8Rk8yr9h5Ss/MBElnxss0ga63zIqmpHfbaJFHnoiRcf32GFZUgVPC0o5NHV iD/SxelJ3jXPw+NOFvmA0FkR+AJlVXVI2ZE6nuBB+c4wGwuwSQJGYIc3v3gseFxHlA8/x1 vIVD4XwXJsrNMtzUwQLRmV+xGyGammPdjfqGnjLSvAFmVAjKc+PYEvP5h5K7ZqW17uVlch JPXabzocae75Y18MW7/rLZ4ZDnSF/iIg/6/WAOkZxbgrEFvA2+ic8sYJgTGuuugzd/Qutt OteiPmqmN3l4lZjY5A6WZgX6YaElbDbynfgu625GTPpHew3eV9N4jclldbgAwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766098676; 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=3J8nGQzyyZDNKT2EiTTukYFTnufY3i1D/52AlFVDuC4=; b=tl1r3MszZWRZm1KSkB9wxtGiB1f74qv4OMi5QzJNJaxUwqkMepUo3rGBJW8rmlNPa3pZd7 f6GExX4ee5f1sRmkPoug/Pzmf7N4ikBi3R5Efqe2R2JNan0eoudsYvcB0aANHI5RV5dYZq Ifaqq2a4AUMJWUmf3QmC2GdNiZQ30PfBzzIoEhswZnZ4T6kIv+Y+NGuNtLooMj380IKylR zLNsKzBLDbLGJZLULnh7GNDyFzTMKfXls0JlZMYah5YQwSTK2anq7mYJ3Jhf0AskMzhjc5 Y75J5s9RWKHy4MwCvXsXZzGcy95jrRwCpBA0zWcv1WXfQKJ11DYNhAz6ZzomCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766098676; a=rsa-sha256; cv=none; b=oyWR7TevSI6r9LoQQ0vRH/WEnRHP1BhaUGjVpOv0K4jg+6gF/OBSUbkEiL6qqcvSXCMACK ALKaaSNjXtmAYRJ1qHQvdaK62iJLvsDuynRU8dDg/pDl09ZXcbga68OTjCH2cP0oe8GB2T vTz9fU6lDbgjNM7Qs5W0PnDfmPL9mtpC4AgGyTeDCtrIlxph9zY+ykDmlJwUydwXLTZ2mN 4KEqljn5oBvr4IOua8wxhAh4OY2Yq8it8SpHyK7XWsWRr/DDLfIidoI/P1Xd1EcBFIENEO LRVLJT+657r30I7/npPrhTlq4lWLsf36wYtrNOczFw84qKgVYzQ3tHz/9aSgIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dXR041bktzyHQ for ; Thu, 18 Dec 2025 22:57:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9059 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 18 Dec 2025 22:57:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: f2164d231f4f - stable/14 - apm(8): Drop MLINK to apmconf(8) 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f2164d231f4f33f93cea9cd13b80a444a69c8f6f Auto-Submitted: auto-generated Date: Thu, 18 Dec 2025 22:57:56 +0000 Message-Id: <694486f4.9059.3045c5ca@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f2164d231f4f33f93cea9cd13b80a444a69c8f6f commit f2164d231f4f33f93cea9cd13b80a444a69c8f6f Author: John Baldwin AuthorDate: 2025-11-13 02:36:14 +0000 Commit: John Baldwin CommitDate: 2025-12-18 22:51:14 +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. (cherry picked from commit daa1f9b415f3bca82cc7a6e555c9c56e1b1c44f5) --- 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 a14c12aaceba..d2bf38c1647d 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20251218: Remove old MLINK to apmconf(8) +OLD_FILES+=usr/share/man/man8/apmconf.8.gz + # 20251218: Remove pccard(4) and related OLD_FILES+=usr/share/man/man4/pccard.4.gz OLD_FILES+=usr/share/man/man4/pcic.4.gz diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile index c18a841b9c16..155e688c23b3 100644 --- a/usr.sbin/apm/Makefile +++ b/usr.sbin/apm/Makefile @@ -1,7 +1,6 @@ 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