Date: Thu, 18 Dec 2025 22:57:34 +0000 From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: fe9134294b22 - stable/15 - apm(8): Drop MLINK to apmconf(8) Message-ID: <694486de.9f9c.5d2d6387@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=fe9134294b22c232b60e666af2ec5d671ea053b3 commit fe9134294b22c232b60e666af2ec5d671ea053b3 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2025-11-13 02:36:14 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2025-12-18 22:50: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 1390c072afbc..e7ddca0e47bc 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 + # 20251208: Rename iwm8000C to correct name. OLD_FILES+=boot/firmware/iwm8000C 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 8help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?694486de.9f9c.5d2d6387>