aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2025-11-13 02:36:14 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2025-11-13 02:38:35 +0000
commitdaa1f9b415f3bca82cc7a6e555c9c56e1b1c44f5 (patch)
treeb2d31644005227cd258ef20f2d24faeca097658e
parent564cad5638d219d5712a8ac61dafa6f804518cab (diff)
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.
-rw-r--r--ObsoleteFiles.inc3
-rw-r--r--usr.sbin/apm/Makefile1
-rw-r--r--usr.sbin/apm/apm.89
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