machdep.apmwarn and machdep.apmhalt were removed in 2017

5 files changed, 13 insertions, 125 deletions

diff --git a/share/man/man4/man4.amd64/apm.4 b/share/man/man4/man4.amd64/apm.4
index 2533f6e8df1..2010f2a5df7 100644
--- a/share/man/man4/man4.amd64/apm.4
+++ b/share/man/man4/man4.amd64/apm.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: apm.4,v 1.7 2016/02/27 20:57:32 natano Exp $
+.\"	$OpenBSD: apm.4,v 1.8 2019/01/23 22:33:43 jsg Exp $
 .\"
 .\"	Copyright (c) 1998 Marco S. Hyman
 .\"
@@ -9,7 +9,7 @@
 .\"	LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
 .\"	FOR A PARTICULAR PURPOSE.
 .\"
-.Dd $Mdocdate: February 27 2016 $
+.Dd $Mdocdate: January 23 2019 $
 .Dt APM 4 amd64
 .Os
 .Sh NAME
@@ -185,17 +185,6 @@ Power change event messages are suppressed.
 Power change event messages are suppressed unless the estimated
 battery life percentage changes.
 .El
-.Pp
-However, in no case will power status messages be displayed until the
-battery life goes below the percentage in the
-.Xr sysctl 8
-state variable
-.Dv machdep.apmwarn .
-Setting
-.Dv machdep.apmwarn
-to zero disables all warnings regardless of the
-.Dv APM_IOC_PRN_CTL
-setting.
 .El
 .Sh FILES
 .Bl -tag -width "/dev/apmctlXXX"
@@ -213,6 +202,4 @@ An attempt to open the file when in use will fail, returning
 .Sh SEE ALSO
 .Xr acpi 4 ,
 .Xr intro 4 ,
-.Xr sysctl.conf 5 ,
-.Xr halt 8 ,
-.Xr sysctl 8
+.Xr halt 8
diff --git a/share/man/man4/man4.arm64/apm.4 b/share/man/man4/man4.arm64/apm.4
index 0041e4cc9c9..72ec6c32133 100644
--- a/share/man/man4/man4.arm64/apm.4
+++ b/share/man/man4/man4.arm64/apm.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: apm.4,v 1.1 2019/01/23 09:59:54 phessler Exp $
+.\"	$OpenBSD: apm.4,v 1.2 2019/01/23 22:33:43 jsg Exp $
 .\"
 .\"	Copyright (c) 1998 Marco S. Hyman
 .\"
@@ -185,17 +185,6 @@ Power change event messages are suppressed.
 Power change event messages are suppressed unless the estimated
 battery life percentage changes.
 .El
-.Pp
-However, in no case will power status messages be displayed until the
-battery life goes below the percentage in the
-.Xr sysctl 8
-state variable
-.Dv machdep.apmwarn .
-Setting
-.Dv machdep.apmwarn
-to zero disables all warnings regardless of the
-.Dv APM_IOC_PRN_CTL
-setting.
 .El
 .Sh FILES
 .Bl -tag -width "/dev/apmctlXXX"
@@ -213,6 +202,4 @@ An attempt to open the file when in use will fail, returning
 .Sh SEE ALSO
 .Xr acpi 4 ,
 .Xr intro 4 ,
-.Xr sysctl.conf 5 ,
-.Xr halt 8 ,
-.Xr sysctl 8
+.Xr halt 8
diff --git a/share/man/man4/man4.i386/apm.4 b/share/man/man4/man4.i386/apm.4
index 6033bae30f7..b8063e9a528 100644
--- a/share/man/man4/man4.i386/apm.4
+++ b/share/man/man4/man4.i386/apm.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: apm.4,v 1.33 2016/02/27 20:57:32 natano Exp $
+.\"	$OpenBSD: apm.4,v 1.34 2019/01/23 22:33:43 jsg Exp $
 .\"
 .\"	Copyright (c) 1998 Marco S. Hyman
 .\"
@@ -9,7 +9,7 @@
 .\"	LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
 .\"	FOR A PARTICULAR PURPOSE.
 .\"
-.Dd $Mdocdate: February 27 2016 $
+.Dd $Mdocdate: January 23 2019 $
 .Dt APM 4 i386
 .Os
 .Sh NAME
@@ -219,42 +219,7 @@ Power change event messages are suppressed.
 Power change event messages are suppressed unless the estimated
 battery life percentage changes.
 .El
-.Pp
-However, in no case will power status messages be displayed until the
-battery life goes below the percentage in the
-.Xr sysctl 8
-state variable
-.Dv machdep.apmwarn .
-Setting
-.Dv machdep.apmwarn
-to zero disables all warnings regardless of the
-.Dv APM_IOC_PRN_CTL
-setting.
 .El
-.Pp
-As noted above, the operation of the APM
-driver can be modified using the
-.Dv machdep.apmwarn
-.Xr sysctl 8
-variable.
-Another driver modifier is the
-.Dv machdep.apmhalt
-variable.
-When
-.Dv machdep.apmhalt
-is set to 1 the APM
-power down code is modified in a way necessary for correct operation on
-some systems, mainly
-.Tn IBM
-laptops.
-If your system does not power down when given the command
-.Li "halt -p"
-try setting
-.Dv machdep.apmhalt
-to 1 using
-.Xr sysctl 8 .
-The variable can be set at boot time in
-.Xr sysctl.conf 5 .
 .Sh FILES
 .Bl -tag -width "/dev/apmctlXXX"
 .It /dev/apm
@@ -271,11 +236,9 @@ An attempt to open the file when in use will fail, returning
 .Sh SEE ALSO
 .Xr acpi 4 ,
 .Xr intro 4 ,
-.Xr sysctl.conf 5 ,
 .Xr apm 8 ,
 .Xr apmd 8 ,
-.Xr halt 8 ,
-.Xr sysctl 8
+.Xr halt 8
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/man4.loongson/apm.4 b/share/man/man4/man4.loongson/apm.4
index 5a0c8f4802c..2ebf98fee17 100644
--- a/share/man/man4/man4.loongson/apm.4
+++ b/share/man/man4/man4.loongson/apm.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: apm.4,v 1.5 2016/02/27 20:57:32 natano Exp $
+.\"     $OpenBSD: apm.4,v 1.6 2019/01/23 22:33:43 jsg Exp $
 .\"
 .\" Copyright (c) 1999 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -34,7 +34,7 @@
 .\"	AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT
 .\"	LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
 .\"	FOR A PARTICULAR PURPOSE.
-.Dd $Mdocdate: February 27 2016 $
+.Dd $Mdocdate: January 23 2019 $
 .Dt APM 4 loongson
 .Os
 .Sh NAME
@@ -230,17 +230,6 @@ Power change event messages are suppressed.
 Power change event messages are suppressed unless the estimated
 battery life percentage changes.
 .El
-.\" .Pp
-.\" However, in no case will power status messages be displayed until the
-.\" battery life goes below the percentage in the
-.\" .Xr sysctl 8
-.\" state variable
-.\" .Dv machdep.apmwarn .
-.\" Setting
-.\" .Dv machdep.apmwarn
-.\" to zero disables all warnings regardless of the
-.\" .Dv APM_IOC_PRN_CTL
-.\" setting.
 .El
 .Sh FILES
 .Bl -tag -width /dev/apmctl
diff --git a/share/man/man4/man4.macppc/apm.4 b/share/man/man4/man4.macppc/apm.4
index d8425a206cb..ce61e25cedb 100644
--- a/share/man/man4/man4.macppc/apm.4
+++ b/share/man/man4/man4.macppc/apm.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: apm.4,v 1.13 2016/02/27 20:57:32 natano Exp $
+.\"	$OpenBSD: apm.4,v 1.14 2019/01/23 22:33:43 jsg Exp $
 .\"
 .\"	Copyright (c) 1998 Marco S. Hyman
 .\"
@@ -9,7 +9,7 @@
 .\"	LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
 .\"	FOR A PARTICULAR PURPOSE.
 .\"
-.Dd $Mdocdate: February 27 2016 $
+.Dd $Mdocdate: January 23 2019 $
 .Dt APM 4 macppc
 .Os
 .Sh NAME
@@ -217,43 +217,7 @@ Power change event messages are suppressed.
 Power change event messages are suppressed unless the estimated
 battery life percentage changes.
 .El
-.Pp
-However, in no case will power status messages be displayed until the
-battery life goes below the percentage in the
-.Xr sysctl 8
-state variable
-.Dv machdep.apmwarn .
-Setting
-.Dv machdep.apmwarn
-to zero disables all warnings regardless of the
-.Dv APM_IOC_PRN_CTL
-setting.
 .El
-.Pp
-.Em NOT YET SUPPORTED on macppc:
-As noted above, the operation of the APM
-driver can be modified using the
-.Dv machdep.apmwarn
-.Xr sysctl 8
-variable.
-Another driver modifier is the
-.Dv machdep.apmhalt
-variable.
-When
-.Dv machdep.apmhalt
-is set to 1 the APM
-power down code is modified in a way necessary for correct operation on
-some systems, mainly
-.Tn IBM
-laptops.
-If your system does not power down when given the command
-.Li "halt -p"
-try setting
-.Dv machdep.apmhalt
-to 1 using
-.Xr sysctl 8 .
-The variable can be set at boot time in
-.Xr sysctl.conf 5 .
 .Sh FILES
 .Bl -tag -width "/dev/apmctlXXX"
 .It /dev/apm
@@ -270,11 +234,9 @@ An attempt to open the file when in use will fail, returning
 .Sh SEE ALSO
 .Xr adb 4 ,
 .Xr intro 4 ,
-.Xr sysctl.conf 5 ,
 .Xr apm 8 ,
 .Xr apmd 8 ,
-.Xr halt 8 ,
-.Xr sysctl 8
+.Xr halt 8
 .Sh HISTORY
 The
 .Nm