- for pwraction, point to acpibtn(4)

- for lidaction, document the value 0
- for lidaction, adjust the description to a format similar
to that of pwraction

ok kettenis deraadt

diff --git a/etc/etc.amd64/sysctl.conf b/etc/etc.amd64/sysctl.conf
index e968b32..e2683ca 100644 (file)
--- a/etc/etc.amd64/sysctl.conf
+++ b/etc/etc.amd64/sysctl.conf
@@ -1,4 +1,4 @@
 #machdep.allowaperture=2       # See xf86(4)
 #machdep.kbdreset=1            # permit console CTRL-ALT-DEL to do a nice halt
-#machdep.lidaction=0           # 1=suspend, 2=hibernate laptop upon lid closing
-#machdep.pwraction=1           # ACPI power button action: 0=none, 1=shutdown, 2=suspend
+#machdep.lidaction=0           # laptop lid closing action: 0=none, 1=suspend, 2=hibernate
+#machdep.pwraction=0           # acpibtn(4) power button action: 0=none, 1=shutdown, 2=suspend

diff --git a/etc/etc.arm64/sysctl.conf b/etc/etc.arm64/sysctl.conf
index a3f6e59..294c2d9 100644 (file)
--- a/etc/etc.arm64/sysctl.conf
+++ b/etc/etc.arm64/sysctl.conf
@@ -1 +1 @@
-#machdep.lidaction=0           # 1=suspend, 2=hibernate laptop upon lid closing
+#machdep.lidaction=0           # laptop lid closing action: 0=none, 1=suspend, 2=hibernate

diff --git a/etc/etc.i386/sysctl.conf b/etc/etc.i386/sysctl.conf
index 9e8d325..268af0d 100644 (file)
--- a/etc/etc.i386/sysctl.conf
+++ b/etc/etc.i386/sysctl.conf
@@ -1,4 +1,4 @@
 #machdep.allowaperture=2       # See xf86(4)
 #machdep.apmhalt=1             # 1=powerdown hack, try if halt -p doesn't work
 #machdep.kbdreset=1            # permit console CTRL-ALT-DEL to do a nice halt
-#machdep.lidaction=0           # 1=suspend, 2=hibernate laptop upon lid closing
+#machdep.lidaction=0           # laptop lid closing action: 0=none, 1=suspend, 2=hibernate

diff --git a/etc/etc.loongson/sysctl.conf b/etc/etc.loongson/sysctl.conf
index a3f6e59..294c2d9 100644 (file)
--- a/etc/etc.loongson/sysctl.conf
+++ b/etc/etc.loongson/sysctl.conf
@@ -1 +1 @@
-#machdep.lidaction=0           # 1=suspend, 2=hibernate laptop upon lid closing
+#machdep.lidaction=0           # laptop lid closing action: 0=none, 1=suspend, 2=hibernate