From owner-svn-doc-head@FreeBSD.ORG  Sat Dec  8 00:09:40 2012
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 439662CA;
 Sat,  8 Dec 2012 00:09:40 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0DC988FC12;
 Sat,  8 Dec 2012 00:09:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB809dZP017787;
 Sat, 8 Dec 2012 00:09:39 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB809deU017786;
 Sat, 8 Dec 2012 00:09:39 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212080009.qB809deU017786@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sat, 8 Dec 2012 00:09:39 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40305 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Dec 2012 00:09:40 -0000

Author: eadler
Date: Sat Dec  8 00:09:39 2012
New Revision: 40305
URL: http://svnweb.freebsd.org/changeset/doc/40305

Log:
  Remove references to ancient technology: apm is dead.
  
  Discussed with:	dwhite
  Reviewed by:	imp
  Noted by:	Jakub Lach
  Approved by:	bcr (mentor)

Modified:
  head/en_US.ISO8859-1/books/faq/book.xml

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Fri Dec  7 13:01:14 2012	(r40304)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Sat Dec  8 00:09:39 2012	(r40305)
@@ -2428,17 +2428,9 @@ bindkey ^[[3~ delete-char # for xterm</p
 	  </question>
 
 	  <answer>
-	    <para>&os; supports <acronym>APM</acronym> on certain
-	      machines.  Further information can be found in
-	      &man.apm.4;.</para>
-
-	    <para>&os; also supports the <acronym>ACPI</acronym>
-	      features found in most modern hardware.  Further
-	      information can be found in &man.acpi.4;.  If a system
-	      supports both <acronym>APM</acronym> and
-	      <acronym>ACPI</acronym>, either can be used.  We suggest
-	      you try both and choose the one that best fits your
-	      needs.</para>
+	    <para>&os; supports the <acronym>ACPI</acronym>
+	      features found in modern hardware.  Further
+	      information can be found in &man.acpi.4;.</para>
 	  </answer>
 	</qandaentry>
       </qandaset>
@@ -9059,9 +9051,8 @@ hint.sio.7.irq="12"</programlisting>
 	  <para>Seriously, &os; uses the
 	    <acronym>HLT</acronym> (halt) instruction when the system is
 	    idle thus lowering its energy consumption and therefore the
-	    heat it generates.  Also if you have <acronym>APM</acronym>
-	    (advanced power
-	    management) or <acronym>ACPI</acronym> (Advanced
+	    heat it generates.  Also if you have
+	    <acronym>ACPI</acronym> (Advanced
 	    Configuration and Power Interface)
 	    configured, then &os; can also put the CPU into
 	    a low power mode.</para>