From daa1f9b415f3bca82cc7a6e555c9c56e1b1c44f5 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 12 Nov 2025 21:36:14 -0500
Subject: [PATCH] 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 1654ee06941..6ce096ac92d 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 f6c42194401..f9b3e11d22f 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 d6ede22066d..e295ec989a7 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