From nobody Thu Dec 18 22:57:34 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 4dXQzf4TDMz6LylS for ; Thu, 18 Dec 2025 22:57:34 +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 4dXQzf239tz3qPt for ; Thu, 18 Dec 2025 22:57:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766098654; 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=sHLQVwknsoMuXI2a+6AtRhx0MGNG+ar/motp+jwNm8s=; b=JuhjBr1FOuKofT8Nd15cVJP3lVpuCUUMmuEZ3WGd3M90Q6eNQUb0O3wvZ5L+ssv1v8Pv2w ywdFPG9grR/fjlw0xtlT3XOveIkGMcXuNMZzmT8pSd7X+qjV0aCXr/ajdiccbMB5Z91IaE OQjwjtR02g4iTGfVSLlRhTBkdW+hL/L19hoO+WrThJpVzFZqY7AN/5oIJ75TGAJQl8jVdr WEvQZsgNDTRkvngHMEN6YAZi3X5wAHCOrKV9A4tRkMSImxeCbAU1o3a7Vg8bM94k8DDdAR OSNlTxuIUzEzr7GtMk0IaJaCR3PwZYe4pb1atUGes/8MldVDXtfwDtuBRabKkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766098654; 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=sHLQVwknsoMuXI2a+6AtRhx0MGNG+ar/motp+jwNm8s=; b=D1WFgTEXqbG667N4ROgiAvI2KyAoSYF4f6iShrK3YyXvoeIe0fkRVzn8vNXvzZ5XGEORoO itjMcGYHXIvI7KsJi32YEkX8JqZFgrYjBQizgEjHMi37wyJsEEWRM7s5P2swHc3on1F0tf dE6FjJUKcAPkfLDHGF0pIP4cpmscNUCjbr0BOX5AEILf6fC2EyKP58rOZ0nBuk7U4NxQM+ XJiJxdRi7HeTwrHXWP6FdTsGaTQn4CNiXwn79DVLDjmmZY5FUBkTSB6O7yFqFFvVO5psD6 iwthBsAy7BfJpzG4obZygaVnx0n3c+81GFq9HvRWhgcGnS129pEWTt1Ufj+Xtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766098654; a=rsa-sha256; cv=none; b=EhCUtcZ7mW7HBYmJUReGaMXhQPCX+ZIkFiodhj4BzwLYJjGNMcrsKPoUzag65lNXoZZxVB ugYRNbxf4ZjgzgAFciac4lTNVNeHTLUdeBdI+caau0WbhCTatKL1JMa2zKQR7XhTA7k5OL qho6gsfVw2EV0bRxmlGS0O/AvviTE50ymUPld3OLZe0j1R66JwPc7WPdhd27+SZU+3bw32 xIni4qGhe84cW+8a8+vXN4skb7Q+TwzfnWRfwQXZ6+q0jKahAsRgtObkvTvs1w+s9goNR8 ULVtORKdrveHKM3Tgom4FizqROg1EyR4OJL8NSFIqND+tmcCSLHuIbaFqWMPgQ== 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 4dXQzf0mwBzy34 for ; Thu, 18 Dec 2025 22:57:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9f9c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 18 Dec 2025 22:57:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: fe9134294b22 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: fe9134294b22c232b60e666af2ec5d671ea053b3 Auto-Submitted: auto-generated Date: Thu, 18 Dec 2025 22:57:34 +0000 Message-Id: <694486de.9f9c.5d2d6387@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=fe9134294b22c232b60e666af2ec5d671ea053b3 commit fe9134294b22c232b60e666af2ec5d671ea053b3 Author: John Baldwin AuthorDate: 2025-11-13 02:36:14 +0000 Commit: John Baldwin 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 8