Index: en_US.ISO8859-1/books/faq/book.xml
===================================================================
--- en_US.ISO8859-1/books/faq/book.xml
+++ en_US.ISO8859-1/books/faq/book.xml
@@ -14,10 +14,6 @@
 <!ENTITY rel2.stable "<emphasis xmlns='http://docbook.org/ns/docbook'>9-STABLE</emphasis>">
 <!ENTITY rel2.releng "<symbol xmlns='http://docbook.org/ns/docbook'>stable/9/</symbol>">
 <!ENTITY rel2.relengdate "September 2011">
-<!ENTITY rel3.relx "8.<replaceable xmlns='http://docbook.org/ns/docbook'>X</replaceable>">
-<!ENTITY rel3.stable "<emphasis xmlns='http://docbook.org/ns/docbook'>8-STABLE</emphasis>">
-<!ENTITY rel3.releng "<symbol xmlns='http://docbook.org/ns/docbook'>stable/8/</symbol>">
-<!ENTITY rel3.relengdate "August 2009">
 ]>
 <book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
   <info>
@@ -73,7 +69,7 @@
 
     <abstract>
       <para>This is the Frequently Asked Questions
-	<acronym>FAQ</acronym> for &os; versions &rel3.relx;,
+	<acronym>FAQ</acronym> for &os; versions
 	&rel2.relx; and &rel.relx;.  Every effort has been made to
 	make this <acronym>FAQ</acronym> as informative as possible;
 	if you have any suggestions as to how it may be improved, send
@@ -3753,9 +3749,8 @@
 
 	  <para>In order to use a full screen editor such as
 	    &man.vi.1; or &man.emacs.1;, run
-	    <command>export TERM=xterm</command> on &os; 9.0+, or
-	    <command>export TERM=cons25</command> on &os; 8.X so that
-	    these editors can load the correct data from the
+	    <command>export TERM=xterm</command> on &os; 9.0+
+	    so that these editors can load the correct data from the
 	    &man.termcap.5; database.</para>
 
 	  <para>After performing these steps, edit
@@ -7230,11 +7225,6 @@
 
 	  <itemizedlist>
 	    <listitem>
-	      <para>&rel3.releng; AKA
-		&rel3.stable;</para>
-	    </listitem>
-
-	    <listitem>
 	      <para>&rel2.releng; AKA
 		&rel2.stable;</para>
 	    </listitem>