svn commit: r41206 - head/en_US.ISO8859-1/books/faq

[Eitan Adler]

Author: eadler
Date: Thu Mar 14 13:14:24 2013
New Revision: 41206
URL: http://svnweb.freebsd.org/changeset/doc/41206

Log:
  Update and modernize the version numbers used in the FAQ examples.
  Remove references to 7.x.
  
  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	Thu Mar 14 10:25:23 2013	(r41205)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Thu Mar 14 13:14:24 2013	(r41206)
@@ -18,18 +18,12 @@
 <!ENTITY rel2.releng "<symbol>RELENG_8</symbol>">
 <!ENTITY rel2.relengdate "August 2009">
 <!ENTITY rel2.packages "packages-8-stable">
-<!ENTITY rel3.current "7.4">
-<!ENTITY rel3.relx "7.<replaceable>X</replaceable>">
-<!ENTITY rel3.stable "<emphasis>7-STABLE</emphasis>">
-<!ENTITY rel3.releng "<symbol>RELENG_7</symbol>">
-<!ENTITY rel3.relengdate "October 2007">
-<!ENTITY rel3.packages "packages-7-stable">
 ]>
 
 <book lang='en'>
   <bookinfo>
     <title>Frequently Asked Questions for &os;
-      &rel3.relx;, &rel2.relx;, and &rel.relx;</title>
+     &rel2.relx;, and &rel.relx;</title>
 
     <corpauthor>The &os; Documentation Project</corpauthor>
 
@@ -78,10 +72,8 @@
 
     <abstract>
       <para>This is the FAQ for &os; versions
-	&rel3.relx;, &rel2.relx; and &rel.relx;.
-	All entries are assumed to be
-	relevant to &os; &rel3.relx; and later,
-	unless otherwise noted.  If you are interested in helping with
+	&rel2.relx; and &rel.relx;.
+	If you are interested in helping with
 	this project, send email to the &a.doc;.  The latest version of
 	this document is always available from the <ulink
 	  url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/faq/index.html">&os; website</ulink>.
@@ -98,7 +90,7 @@
     <title>Introduction</title>
 
     <para>Welcome to the &os;
-      &rel3.relx; -, &rel2.relx; - and &rel.relx; -
+      &rel2.relx; - and &rel.relx; -
       FAQ!</para>
 
     <para>As is usual with Usenet FAQs, this document aims to cover the
@@ -352,14 +344,15 @@
 	    made from the &rel.stable; branch, and &rel2.relx;
 	    releases are made from the &rel2.stable; branch.</para>
 
-	  <para>Up until the release of 8.0, the
-	    &rel3.relx; series was the one known as
-	    <emphasis>-STABLE</emphasis>.  However, as of 8.0, the
-	    &rel3.relx; branch will be designated for
+	  <para>Up until the release of 9.0, the
+	    &rel2.relx; series was the one known as
+	    <emphasis>-STABLE</emphasis>.  However, as of
+	    &rel.head.relx;, the
+	    &rel2.relx;. branch will be designated for
 	    an <quote>extended support</quote> status and receive only
 	    fixes for major problems, such as security-related fixes.
 	    There will be no more releases made from the
-	    &rel3.stable; branch, and it is considered a
+	    &rel2.stable; branch, and it is considered a
 	    <quote>legacy</quote> branch and most current work will only
 	    become a part of &rel.stable; and &rel2.stable;.</para>
 
@@ -2604,7 +2597,7 @@ kern.timecounter.hardware: TSC -> i82
 	    periodic updates on new entries.</para>
 
 	  <para>Most ports should work on the
-	    &rel3.relx;, &rel2.relx;, and &rel.relx; branches.
+	    &rel2.relx;, and &rel.relx; branches.
 	    Each time a &os;
 	    release is made, a snapshot of the ports tree at the time of
 	    release in also included in the <filename class="directory">ports/</filename>
@@ -2629,15 +2622,6 @@ kern.timecounter.hardware: TSC -> i82
 
 	  <variablelist>
 	    <varlistentry>
-	      <term>for &rel3.relx; -RELEASE/&rel3.stable;</term>
-
-	      <listitem>
-		<para><ulink
-		    url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel3.packages;/">ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel3.packages;</ulink></para>
-	      </listitem>
-	    </varlistentry>
-
-	    <varlistentry>
 	      <term>for &rel2.relx; -RELEASE/&rel2.stable;</term>
 
 	      <listitem>
@@ -2710,7 +2694,7 @@ kern.timecounter.hardware: TSC -> i82
       <qandaentry>
 	<question id="ports-4x">
 	  <para>Why can I not build this port on my
-	    &rel3.relx; -, &rel2.relx; -, or
+	    &rel2.relx; -, or
 	    &rel.relx; -STABLE machine?</para>
 	</question>
 
@@ -4517,8 +4501,8 @@ options    SYSVMSG          # enable for
 	    the same way as <emphasis>-PRERELEASE</emphasis>.)</para>
 
 	  <para>Long answer: &os; derives its releases from one of two
-	    places.  Major, dot-zero, releases, such as 7.0-RELEASE and
-	    8.0-RELEASE, are branched from the head of the development
+	    places.  Major, dot-zero, releases, such as 9.0-RELEASE
+	    are branched from the head of the development
 	    stream, commonly referred to as <link
 	    linkend="current">-CURRENT</link>.  Minor releases, such as
 	    6.3-RELEASE or 5.2-RELEASE, have been snapshots of the
@@ -8002,11 +7986,6 @@ hint.sio.7.irq="12"</programlisting>
 
 	  <itemizedlist>
 	    <listitem>
-	      <para>&rel3.releng; AKA
-		&rel3.stable;</para>
-	    </listitem>
-
-	    <listitem>
 	      <para>&rel2.releng; AKA
 		&rel2.stable;</para>
 	    </listitem>