From 5e802b843ffcb0e2d422a7623d71e7e8c902aa3e Mon Sep 17 00:00:00 2001
From: Gabor Pali <pgj@FreeBSD.org>
Date: Tue, 3 Jun 2008 15:47:10 +0000
Subject: [PATCH] Update Question 7.1: - Replace freebsd-announce with
 &a.announce; - Update version numbers 4.X, 5.X, 6.X to 6.X, 7.X, 8.X - Add
 <replaceable> to meta-minor version numbers - Fix sysinstall(8) - Mark up
 sysinstall(8) menus with <guimenuitem> - Remove mention of .tgz packet
 formats (only .tbz packets used) - Update FTP paths to 6-STABLE, 7-STABLE,
 8-CURRENT

Approved by:	gabor (mentor)
---
 en_US.ISO8859-1/books/faq/book.sgml | 55 ++++++++++++-----------------
 1 file changed, 23 insertions(+), 32 deletions(-)

diff --git a/en_US.ISO8859-1/books/faq/book.sgml b/en_US.ISO8859-1/books/faq/book.sgml
index d3032a10c0..db44a95c49 100644
--- a/en_US.ISO8859-1/books/faq/book.sgml
+++ b/en_US.ISO8859-1/books/faq/book.sgml
@@ -4241,11 +4241,12 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
             for info on software packages ported to FreeBSD.  The list
             currently tops &os.numports; and is growing daily, so come
             back to check often or subscribe to the
-            <literal>freebsd-announce</literal> <link
-            linkend="mailing">mailing list</link> for periodic updates
+            &a.announce;
+            for periodic updates
             on new entries.</para>
 
-          <para>Most ports should work on the 4.X, 5.X, and 6.X branches.
+          <para>Most ports should work on the
+	  6.<replaceable>X</replaceable>, 7.<replaceable>X</replaceable> and 8.<replaceable>X</replaceable> branches.
             Each time a FreeBSD release is made, a snapshot of the
             ports tree at the time of release in also included in the
             <filename>ports/</filename> directory.</para>
@@ -4258,12 +4259,12 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
             again easily without having to know the gory details of
             which files it includes.</para>
 
-          <para>Use the package installation menu in
-            <filename>/stand/sysinstall</filename> (under the
-            post-configuration menu item) or invoke the
+          <para>Use the <guimenuitem>Packages</guimenuitem> package installation menu in
+            &man.sysinstall.8; (under the
+            <guimenuitem>Configure</guimenuitem> menu item) or invoke the
             &man.pkg.add.1; command on the specific package files you
             are interested in installing. Package files can usually be
-            identified by their <filename>.tgz</filename> or <filename>.tbz</filename> suffix and
+            identified by their <filename>.tbz</filename> suffix and
             CDROM distribution people will have a
             <filename>packages/All</filename> directory on their CD
             which contains such files. They can also be downloaded
@@ -4272,39 +4273,29 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
 
             <variablelist>
               <varlistentry>
-                <term>for 4.X-RELEASE/4-STABLE</term>
-                <listitem>
-                  <para><ulink
-                    url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-4-stable/">
-                    ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-4-stable/</ulink></para>
-
-                </listitem>
-              </varlistentry>
-
-              <varlistentry>
-                <term>for 5.X-RELEASE/5-STABLE</term>
-                <listitem>
-                  <para><ulink
-                    url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-5-stable/">
-                    ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-5-stable</ulink></para>
-                </listitem>
-              </varlistentry>
-
-              <varlistentry>
-		<term>for 6.X-RELEASE/6-STABLE</term>
+		<term>for 6.<replaceable>X</replaceable>-RELEASE/6-STABLE</term>
                 <listitem>
                   <para><ulink
                     url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-6-stable/">
-                    ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-6-stable</ulink></para>
+                      ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-6-stable</ulink></para>
                 </listitem>
               </varlistentry>
 
               <varlistentry>
-                <term>for 7-CURRENT</term>
+                <term>for 7.<replaceable>X</replaceable>-RELEASE/7-STABLE</term>
                 <listitem>
                   <para><ulink
-                    url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-7-current/">
-                    ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-7-current</ulink></para>
+                    url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-7-stable/">
+                      ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-7-stable</ulink></para>
+                </listitem>
+              </varlistentry>
+
+	            <varlistentry>
+                <term>for 8-CURRENT</term>
+                <listitem>
+                  <para><ulink
+                    url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-8-current/">
+                      ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-8-current</ulink></para>
                 </listitem>
               </varlistentry>
             </variablelist>
@@ -4315,7 +4306,7 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
             new ones are constantly being added. It is always a good idea
             to check back periodically to see which packages are available
             at the <ulink
-            url="ftp://ftp.FreeBSD.org/pub/FreeBSD/">ftp.FreeBSD.org</ulink>
+              url="ftp://ftp.FreeBSD.org/pub/FreeBSD/">ftp.FreeBSD.org</ulink>
             master site.</para>
         </answer>
       </qandaentry>