From owner-svn-doc-head@FreeBSD.ORG  Sun Nov  4 17:44:09 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 AA0092E3;
 Sun,  4 Nov 2012 17:44:09 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 921698FC0C;
 Sun,  4 Nov 2012 17:44:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id qA4Hi9kZ038696;
 Sun, 4 Nov 2012 17:44:09 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA4Hi9A6038694;
 Sun, 4 Nov 2012 17:44:09 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201211041744.qA4Hi9A6038694@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 4 Nov 2012 17:44:09 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r39934 - 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: Sun, 04 Nov 2012 17:44:09 -0000

Author: eadler
Date: Sun Nov  4 17:44:09 2012
New Revision: 39934
URL: http://svn.freebsd.org/changeset/doc/39934

Log:
  ACPI is the modern version. Also, add <acronym> tags
  when required.  Remove reference to Linux when not required.
  
  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	Sun Nov  4 17:44:01 2012	(r39933)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Sun Nov  4 17:44:09 2012	(r39934)
@@ -9362,11 +9362,14 @@ hint.sio.7.irq="12"</programlisting>
 	    <quote>scratch and sniff</quote> GUI.  It is a funny old
 	    business we are in!</para>
 
-	  <para>Seriously, both &os; and &linux; use the
+	  <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 APM (advanced power
-	    management) configured, then &os; can also put the CPU into
+	    heat it generates.  Also if you have <acronym>APM</acronym>
+	    (advanced power
+	    management) or <acronym>ACPI</acronym> (Advanced
+	    Configuration and Power Interface)
+	    configured, then &os; can also put the CPU into
 	    a low power mode.</para>
 	</answer>
       </qandaentry>