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

Glen Barber gjb at
Tue Feb 18 18:25:52 UTC 2014

Author: gjb
Date: Tue Feb 18 18:25:51 2014
New Revision: 43982

  Add corrected entries for the 10.x branch entities and
  update to reflect -CURRENT is now 11.0.
  While here, swap pkg_add(1) for pkg(7), and dereference
  FTP packages/ directory links.
  Sponsored by:	The FreeBSD Foundation


Modified: head/en_US.ISO8859-1/books/faq/book.xml
--- head/en_US.ISO8859-1/books/faq/book.xml	Tue Feb 18 18:11:29 2014	(r43981)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Tue Feb 18 18:25:51 2014	(r43982)
@@ -2,25 +2,26 @@
 <!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
 	"" [
 <!ENTITY bibliography SYSTEM "../../../share/xml/bibliography.xml">
-<!ENTITY rel.numbranch "3">  <!-- number of branches that follow in this list -->
-<!ENTITY rel.head "<emphasis xmlns=''>10-CURRENT</emphasis>">
-<!ENTITY rel.head.relx "10.<replaceable xmlns=''>X</replaceable>">
+<!ENTITY rel.numbranch "4">  <!-- number of branches that follow in this list -->
+<!ENTITY rel.head "<emphasis xmlns=''>11-CURRENT</emphasis>">
+<!ENTITY rel.head.relx "11.<replaceable xmlns=''>X</replaceable>">
 <!ENTITY rel.head.releng "<symbol xmlns=''>head/</symbol>">
-<!ENTITY rel.head.packages "packages-10-current">
-<!ENTITY rel.relx "9.<replaceable xmlns=''>X</replaceable>">
-<!ENTITY rel.stable "<emphasis xmlns=''>9-STABLE</emphasis>">
-<!ENTITY rel.releng "<symbol xmlns=''>stable/9/</symbol>">
-<!ENTITY rel.relengdate "September 2011">
-<!ENTITY rel.packages "packages-9-stable">
-<!ENTITY rel2.relx "8.<replaceable xmlns=''>X</replaceable>">
-<!ENTITY rel2.stable "<emphasis xmlns=''>8-STABLE</emphasis>">
-<!ENTITY rel2.releng "<symbol xmlns=''>stable/8/</symbol>">
-<!ENTITY rel2.relengdate "August 2009">
-<!ENTITY rel2.packages "packages-8-stable">
+<!ENTITY rel.relx "10.<replaceable xmlns=''>X</replaceable>">
+<!ENTITY rel.stable "<emphasis xmlns=''>10-STABLE</emphasis>">
+<!ENTITY rel.releng "<symbol xmlns=''>stable/10/</symbol>">
+<!ENTITY rel.relengdate "January 2014">
+<!ENTITY rel2.relx "9.<replaceable xmlns=''>X</replaceable>">
+<!ENTITY rel2.stable "<emphasis xmlns=''>9-STABLE</emphasis>">
+<!ENTITY rel2.releng "<symbol xmlns=''>stable/9/</symbol>">
+<!ENTITY rel2.relengdate "September 2011">
+<!ENTITY rel3.relx "8.<replaceable xmlns=''>X</replaceable>">
+<!ENTITY rel3.stable "<emphasis xmlns=''>8-STABLE</emphasis>">
+<!ENTITY rel3.releng "<symbol xmlns=''>stable/8/</symbol>">
+<!ENTITY rel3.relengdate "August 2009">
 <book xmlns="" xmlns:xlink="" version="5.0" xml:lang="en">
   <info><title>Frequently Asked Questions for &os;
-      &rel2.relx;, &rel.relx; and &rel.head.relx;</title>
+      &rel3.relx;, &rel2.relx; and &rel.relx;</title>
     <author><orgname>The &os; Documentation Project</orgname></author>
@@ -69,7 +70,7 @@
-      <para>This is the FAQ for &os; versions &rel2.relx; and
+      <para>This is the FAQ for &os; versions &rel3.relx;, &rel2.relx; and
 	&rel.relx;.  Every effort has been made to make this FAQ as
 	informative as possible; if you have any suggestions as to how
 	it may be improved, please feel free to mail them to the
@@ -2382,7 +2383,7 @@ kern.timecounter.hardware: TSC -> i82
 	    periodic updates on new entries.</para>
 	  <para>Most ports should work on the
-	    &rel2.relx;, and &rel.relx; branches.
+	    &rel3.relx;, &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>ports/</filename>
@@ -2396,40 +2397,13 @@ kern.timecounter.hardware: TSC -> i82
 	    to know the gory details of which files it includes.</para>
-	    &man.pkg.add.1; on the specific package files
+	    &man.pkg.7; on the specific package files
 	    you are interested in installing.  Package files can usually
-	    be identified by their <filename>.tbz</filename> suffix and
+	    be identified by their <filename>.txz</filename> suffix and
 	    CD-ROM distribution people will have a
 	    <filename>packages/All</filename> directory on their CD
 	    which contains such files.  They can also be downloaded over
-	    the net for various versions of &os; at the following
-	    locations:</para>
-	  <variablelist>
-	    <varlistentry>
-	      <term>for &rel2.relx; -RELEASE/&rel2.stable;</term>
-	      <listitem>
-		<para><link xlink:href=";/">;</link></para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>for &rel.relx; -RELEASE/&rel.stable;</term>
-	      <listitem>
-		<para><link xlink:href=";/">;</link></para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-	  <para>or your nearest local mirror site.</para>
-	  <para>Note that all ports may not be available as packages
-	    since new ones are constantly being added.  It is always a
-	    good idea to check back periodically to see which packages
-	    are available at the <link xlink:href=""></link>
-	    master site.</para>
+	    the net for various versions of &os;.</para>
@@ -7654,6 +7628,11 @@ hint.sio.7.irq="12"</programlisting>
+	      <para>&rel3.releng; AKA
+		&rel3.stable;</para>
+	    </listitem>
+	    <listitem>
 	      <para>&rel2.releng; AKA

More information about the svn-doc-all mailing list