On Sun, Mar 21, 2021 at 01:24:49PM +0100, Klemens Nanni wrote: > On Sun, Mar 21, 2021 at 06:50:23AM +0000, Jason McIntyre wrote: > > On Sat, Mar 20, 2021 at 07:29:11PM -0600, Theo de Raadt wrote: > > > There is a pattern we've followed in the past, that when a manpage applies > > > to more than 2 (or 3?) architectures, then we simply make it MI. > > > > > > So MANSUBDIR would get deleted, and then the sets would be updated. > That makes sense. > > > > People with old systems will retain the old files, but I think man(1) > > > selects the MI ones over the MD ones (I think we have no override > > > capability). > > > > > > > man chooses the MD page over the MI page, i think. from man(1): > > > > Machine specific areas are searched before general areas. > > > > so you'd get the old page unless you deleted it. i don;t know if you can > > override that. > Isn't that what we have current.html and sysclean(1) for? > > If so, I'd commit the following and mention the MD manuals for removal > in current.html just like we do when removing old files after upgrading > perl or so. > > Feedback? OK? Ping.
Here's both the apm and current.html diff. Index: usr.sbin/apm/Makefile =================================================================== RCS file: /cvs/src/usr.sbin/apm/Makefile,v retrieving revision 1.19 diff -u -p -r1.19 Makefile --- usr.sbin/apm/Makefile 15 Jul 2020 22:46:52 -0000 1.19 +++ usr.sbin/apm/Makefile 21 Mar 2021 12:21:33 -0000 @@ -19,6 +19,5 @@ NOPROG=yes .endif MAN= apm.8 -MANSUBDIR=arm64 amd64 i386 loongson macppc sparc64 .include <bsd.prog.mk> Index: usr.sbin/apmd/Makefile =================================================================== RCS file: /cvs/src/usr.sbin/apmd/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- usr.sbin/apmd/Makefile 15 Jul 2020 22:46:52 -0000 1.15 +++ usr.sbin/apmd/Makefile 21 Mar 2021 12:23:15 -0000 @@ -13,6 +13,5 @@ NOPROG=yes .endif MAN= apmd.8 -MANSUBDIR= arm64 amd64 i386 loongson macppc sparc64 .include <bsd.prog.mk> Index: distrib/sets/lists/man/mi =================================================================== RCS file: /cvs/src/distrib/sets/lists/man/mi,v retrieving revision 1.1616 diff -u -p -r1.1616 mi --- distrib/sets/lists/man/mi 1 Mar 2021 23:26:59 -0000 1.1616 +++ distrib/sets/lists/man/mi 21 Mar 2021 12:21:03 -0000 @@ -2296,8 +2296,6 @@ ./usr/share/man/man8/alpha/setnetbootinfo.8 ./usr/share/man/man8/amd.8 ./usr/share/man/man8/amd64/MAKEDEV.8 -./usr/share/man/man8/amd64/apm.8 -./usr/share/man/man8/amd64/apmd.8 ./usr/share/man/man8/amd64/biosboot.8 ./usr/share/man/man8/amd64/boot.8 ./usr/share/man/man8/amd64/boot_amd64.8 @@ -2307,9 +2305,9 @@ ./usr/share/man/man8/amd64/memconfig.8 ./usr/share/man/man8/amd64/pxeboot.8 ./usr/share/man/man8/amq.8 +./usr/share/man/man8/apm.8 +./usr/share/man/man8/apmd.8 ./usr/share/man/man8/arm64/MAKEDEV.8 -./usr/share/man/man8/arm64/apm.8 -./usr/share/man/man8/arm64/apmd.8 ./usr/share/man/man8/arm64/eeprom.8 ./usr/share/man/man8/arm64/gpioctl.8 ./usr/share/man/man8/armv7/MAKEDEV.8 @@ -2383,8 +2381,6 @@ ./usr/share/man/man8/hppa/mkboot.8 ./usr/share/man/man8/httpd.8 ./usr/share/man/man8/i386/MAKEDEV.8 -./usr/share/man/man8/i386/apm.8 -./usr/share/man/man8/i386/apmd.8 ./usr/share/man/man8/i386/biosboot.8 ./usr/share/man/man8/i386/boot.8 ./usr/share/man/man8/i386/boot_i386.8 @@ -2431,15 +2427,11 @@ ./usr/share/man/man8/login_token.8 ./usr/share/man/man8/login_yubikey.8 ./usr/share/man/man8/loongson/MAKEDEV.8 -./usr/share/man/man8/loongson/apm.8 -./usr/share/man/man8/loongson/apmd.8 ./usr/share/man/man8/lpc.8 ./usr/share/man/man8/lpd.8 ./usr/share/man/man8/luna88k/MAKEDEV.8 ./usr/share/man/man8/luna88k/boot_luna88k.8 ./usr/share/man/man8/macppc/MAKEDEV.8 -./usr/share/man/man8/macppc/apm.8 -./usr/share/man/man8/macppc/apmd.8 ./usr/share/man/man8/macppc/boot.8 ./usr/share/man/man8/macppc/boot_macppc.8 ./usr/share/man/man8/macppc/eeprom.8 @@ -2583,8 +2575,6 @@ ./usr/share/man/man8/spamdb.8 ./usr/share/man/man8/spamlogd.8 ./usr/share/man/man8/sparc64/MAKEDEV.8 -./usr/share/man/man8/sparc64/apm.8 -./usr/share/man/man8/sparc64/apmd.8 ./usr/share/man/man8/sparc64/boot_sparc64.8 ./usr/share/man/man8/sparc64/eeprom.8 ./usr/share/man/man8/sparc64/ldomctl.8 Index: current.html =================================================================== RCS file: /cvs/www/faq/current.html,v retrieving revision 1.1067 diff -u -p -r1.1067 current.html --- current.html 12 Mar 2021 17:23:14 -0000 1.1067 +++ current.html 25 Mar 2021 19:04:33 -0000 @@ -274,6 +274,29 @@ RFC 8981 changed the terminology from pr <code>temporary</code>. +<h3 id="r20210325">2021/03/25 - apm manual pages moved from MD to MI MANPATH </h3> + +<href="https://man.openbsd.org/apm.8";>apm(8)</a> and +<href="https://man.openbsd.org/apmd.8";>apmd(8)</a> are now installed machine +independently and the old machine-dependent manual pages should be removed. + +<blockquote><pre> +# rm /usr/share/man/man8/amd64/apm.8 \ + /usr/share/man/man8/amd64/apmd.8 \ + /usr/share/man/man8/arm64/apm.8 \ + /usr/share/man/man8/arm64/apmd.8 \ + /usr/share/man/man8/i386/apm.8 \ + /usr/share/man/man8/i386/apmd.8 \ + /usr/share/man/man8/loongson/apm.8 \ + /usr/share/man/man8/loongson/apmd.8 \ + /usr/share/man/man8/macppc/apm.8 \ + /usr/share/man/man8/macppc/apmd.8 \ + /usr/share/man/man8/sparc64/apm.8 \ + /usr/share/man/man8/sparc64/apmd.8 +# makewhatis /usr/share/man +</pre></blockquote> + + <!-- Two blank lines before new sections. New sentences start on new lines.
