Install apm(4)'s manual page on x86_64, too.
authorSascha Wildner <saw@online.de>
Sun, 9 Sep 2012 13:00:26 +0000 (15:00 +0200)
committerSascha Wildner <saw@online.de>
Sun, 9 Sep 2012 13:00:26 +0000 (15:00 +0200)
acpi(4) emulates apm(4)'s ioctls so it is relevant on x86_64 too.

Also, mention these things.

Makefile_upgrade.inc
share/man/man4/Makefile
share/man/man4/apm.4 [moved from share/man/man4/man4.i386/apm.4 with 93% similarity]
share/man/man4/man4.i386/Makefile

index 01a9fd9..50a3c1b 100644 (file)
@@ -2039,6 +2039,8 @@ TO_REMOVE+=/usr/share/man/man9/mtx_spinlock_sh.9.gz
 TO_REMOVE+=/usr/include/machine/mtpr.h
 TO_REMOVE+=/usr/include/machine/ultrasound.h
 TO_REMOVE+=/usr/include/bus/pci/pcidevs_data.h
+TO_REMOVE+=/usr/share/man/cat4/i386/apm.4.gz
+TO_REMOVE+=/usr/share/man/man4/i386/apm.4.gz
 
 .if ${MACHINE_ARCH} == "x86_64"
 TO_REMOVE+=/usr/libdata/stallion/2681.sys
index 5c3a22e..981bb2e 100644 (file)
@@ -34,6 +34,7 @@ MAN=  aac.4 \
        amdsmb.4 \
        amr.4 \
        an.4 \
+       apm.4 \
        aps.4 \
        arcmsr.4 \
        arp.4 \
similarity index 93%
rename from share/man/man4/man4.i386/apm.4
rename to share/man/man4/apm.4
index d4740c5..471c4bc 100644 (file)
 .\" use.
 .\"
 .\" $FreeBSD: src/share/man/man4/man4.i386/apm.4,v 1.13.2.5 2001/08/17 13:08:45 ru Exp $
-.\" $DragonFly: src/share/man/man4/man4.i386/apm.4,v 1.7 2007/12/16 01:26:34 swildner Exp $
 .\"
-.Dd November 1, 1994
-.Dt APM 4 i386
+.Dd September 9, 2012
+.Dt APM 4
 .Os
 .Sh NAME
 .Nm apm
 .Nm
 is an interface to the Intel / Microsoft APM (Advanced Power Management) BIOS
 on laptop PCs.
+It has been largely superseded by
+.Xr acpi 4 ,
+which emulates
+.Nm Ap s
+ioctls (see below) so userland can use them as a uniform interface
+(to get at the battery status, for example).
+.Pp
+Note that
+.Em real
+.Nm
+(in the absence of
+.Xr acpi 4 )
+is not available on the
+.Sy x86_64
+platform.
 .Pp
 .Nm
 provides the following power management functions.
index 16d0201..0ba0d48 100644 (file)
@@ -1,7 +1,6 @@
 # $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.122.2.12 2003/04/15 17:23:32 fjoe Exp $
 
-MAN=   apm.4 \
-       ar.4 \
+MAN=   ar.4 \
        cs.4 \
        cy.4 \
        digi.4 \