diff options
author | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
---|---|---|
committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
commit | ee7b0571c2c18bdec848ed2044223cc88db29bd8 (patch) | |
tree | b04f4bd7cd887f50e7d98af35f46b9834ff86c80 /usr.sbin/acpi | |
parent | ffda191e301f128a62c152fde92b692548367fca (diff) | |
parent | 15fc2873832ea5b9b639e701bbbf2e73af8b6a88 (diff) | |
download | src-ee7b0571c2c18bdec848ed2044223cc88db29bd8.tar.gz src-ee7b0571c2c18bdec848ed2044223cc88db29bd8.zip |
Merge head from 7/28
Notes
Notes:
svn path=/projects/bmake/; revision=270164
Diffstat (limited to 'usr.sbin/acpi')
-rw-r--r-- | usr.sbin/acpi/acpiconf/acpiconf.8 | 10 | ||||
-rw-r--r-- | usr.sbin/acpi/acpidb/acpidb.8 | 2 | ||||
-rw-r--r-- | usr.sbin/acpi/acpidump/acpidump.8 | 20 |
3 files changed, 18 insertions, 14 deletions
diff --git a/usr.sbin/acpi/acpiconf/acpiconf.8 b/usr.sbin/acpi/acpiconf/acpiconf.8 index 8a949d7e7274..805e090f5f38 100644 --- a/usr.sbin/acpi/acpiconf/acpiconf.8 +++ b/usr.sbin/acpi/acpiconf/acpiconf.8 @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 16, 2004 +.Dd June 10, 2014 .Dt ACPICONF 8 .Os .Sh NAME @@ -37,6 +37,7 @@ .Nm .Op Fl h .Op Fl i Ar batt +.Op Fl k Ar ack .Op Fl s Ar type .Sh DESCRIPTION The @@ -49,6 +50,9 @@ The following command-line options are recognized: Displays a summary of available options. .It Fl i Ar batt Get design information about the specified battery. +.It Fl k Ar ack +Ack or abort a pending suspend request using the argument provided. +.Sy Most users should not use this option directly. .It Fl s Ar type Enters the specified sleep mode. Recognized types are @@ -87,6 +91,6 @@ utility appeared in The .Nm utility was written by -.An Mitsuru Iwasaki Aq iwasaki@FreeBSD.org . +.An Mitsuru Iwasaki Aq Mt iwasaki@FreeBSD.org . This manual page was written by -.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org . +.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org . diff --git a/usr.sbin/acpi/acpidb/acpidb.8 b/usr.sbin/acpi/acpidb/acpidb.8 index 4ed97a6a399c..67fab31c346d 100644 --- a/usr.sbin/acpi/acpidb/acpidb.8 +++ b/usr.sbin/acpi/acpidb/acpidb.8 @@ -161,7 +161,7 @@ It was imported for The .Nm utility was written by -.An Mitsuru Iwasaki Aq iwasaki@FreeBSD.org +.An Mitsuru Iwasaki Aq Mt iwasaki@FreeBSD.org and uses Intel ACPI-CA for the backend. This manual page was written by .An Nate Lawson . diff --git a/usr.sbin/acpi/acpidump/acpidump.8 b/usr.sbin/acpi/acpidump/acpidump.8 index f1c7a18def32..a03917a1baba 100644 --- a/usr.sbin/acpi/acpidump/acpidump.8 +++ b/usr.sbin/acpi/acpidump/acpidump.8 @@ -181,20 +181,20 @@ and was rewritten to use for .Fx 5.2 . .Sh AUTHORS -.An Doug Rabson Aq dfr@FreeBSD.org -.An Mitsuru IWASAKI Aq iwasaki@FreeBSD.org -.An Yasuo YOKOYAMA Aq yokoyama@jp.FreeBSD.org -.An Nate Lawson Aq njl@FreeBSD.org +.An Doug Rabson Aq Mt dfr@FreeBSD.org +.An Mitsuru IWASAKI Aq Mt iwasaki@FreeBSD.org +.An Yasuo YOKOYAMA Aq Mt yokoyama@jp.FreeBSD.org +.An Nate Lawson Aq Mt njl@FreeBSD.org .Pp .An -nosplit Some contributions made by -.An Chitoshi Ohsawa Aq ohsawa@catv1.ccn-net.ne.jp , -.An Takayasu IWANASHI Aq takayasu@wendy.a.perfect-liberty.or.jp , -.An Yoshihiko SARUMARU Aq mistral@imasy.or.jp , -.An Hiroki Sato Aq hrs@FreeBSD.org , -.An Michael Lucas Aq mwlucas@blackhelicopters.org +.An Chitoshi Ohsawa Aq Mt ohsawa@catv1.ccn-net.ne.jp , +.An Takayasu IWANASHI Aq Mt takayasu@wendy.a.perfect-liberty.or.jp , +.An Yoshihiko SARUMARU Aq Mt mistral@imasy.or.jp , +.An Hiroki Sato Aq Mt hrs@FreeBSD.org , +.An Michael Lucas Aq Mt mwlucas@blackhelicopters.org and -.An Michael Smith Aq msmith@FreeBSD.org . +.An Michael Smith Aq Mt msmith@FreeBSD.org . .Sh BUGS The current implementation does not dump the BOOT structure or other miscellaneous tables. |