From owner-svn-src-stable@freebsd.org  Fri Sep 25 22:19:36 2015
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D69BCA08086;
 Fri, 25 Sep 2015 22:19:36 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C40CE1F3B;
 Fri, 25 Sep 2015 22:19:36 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8PMJaQq078499;
 Fri, 25 Sep 2015 22:19:36 GMT (envelope-from jkim@FreeBSD.org)
Received: (from jkim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8PMJahi078498;
 Fri, 25 Sep 2015 22:19:36 GMT (envelope-from jkim@FreeBSD.org)
Message-Id: <201509252219.t8PMJahi078498@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jkim set sender to
 jkim@FreeBSD.org using -f
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Fri, 25 Sep 2015 22:19:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r288237 - stable/10/usr.sbin/acpi/acpiconf
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Sep 2015 22:19:36 -0000

Author: jkim
Date: Fri Sep 25 22:19:35 2015
New Revision: 288237
URL: https://svnweb.freebsd.org/changeset/base/288237

Log:
  MFC:	r288116
  
  Remove unsupported S5 (power off) state.

Modified:
  stable/10/usr.sbin/acpi/acpiconf/acpiconf.8
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/acpi/acpiconf/acpiconf.8
==============================================================================
--- stable/10/usr.sbin/acpi/acpiconf/acpiconf.8	Fri Sep 25 22:08:20 2015	(r288236)
+++ stable/10/usr.sbin/acpi/acpiconf/acpiconf.8	Fri Sep 25 22:19:35 2015	(r288237)
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 10, 2014
+.Dd September 22, 2015
 .Dt ACPICONF 8
 .Os
 .Sh NAME
@@ -62,11 +62,9 @@ Recognized types are
 (not implemented on most systems but similar to S1),
 .Cm 3
 (the CPU context is lost and memory context is preserved),
-.Cm 4
-(the CPU context is lost and memory context is stored to disk)
 and
-.Cm 5
-(soft off).
+.Cm 4
+(the CPU context is lost and memory context is stored to disk).
 Sleep states may also be given as S1, S2, etc.
 The supported states depend on BIOS implementation, including ACPI
 byte code (AML).