Update the FAQ:

- Change the frequency of snapshots from a day to a month
- Fix a missing closing parenthesis
- Add snapshot site http://snapshots.us.freebsd.org
- Generalize the paragraph about development branches
- Add an 18 months release interval for major versions and
  8 months for minor versions
- Fix link for the PR query interface

PR:             docs/115000
Submitted by:   Ben Kaduk <minimarmot at gmail dot com>
Reviewed by:    danger, trhodes
Approved by:    gabor (mentor)

en_US.ISO8859-1/books/faq/book.sgml

@@ -368,11 +368,11 @@
             groups</quote> on the -CURRENT mailing list may be
             treated with contempt.</para>
 
-          <para>Every day, <ulink
+          <para>Every month, <ulink
 	    url="&url.base;/snapshots/">snapshot
             </ulink> releases are made based on the current state of the
-            -CURRENT and -STABLE branches.  Distributions of the
+            -CURRENT and -STABLE branches.
-            occasional snapshot are made available. The goals
+            The goals
             behind each snapshot release are:</para>
 
           <itemizedlist>
@@ -392,7 +392,7 @@
               <para>To preserve a fixed reference point for the code in
                 question, just in case we break something really badly
                 later.  (Although CVS normally prevents anything horrible
-                like this happening :)</para>
+                like this happening.)</para>
             </listitem>
 
             <listitem>
@@ -411,8 +411,11 @@
 	  <para>Snapshot releases are directly available from <ulink
 	    url="&url.base;/snapshots/">snapshot</ulink>.</para>
 
-          <para>Snapshots are generated, on the average, daily for
+          <para>Official snapshots are generated each month on a regular basis for
-            all actively developed branches.</para>
+            all actively developed branches.  There are also
+            daily snapshot builds of the popular &arch.i386;
+            and &arch.amd64 branches, hosted on
+            <ulink url="http://snapshots.us.freebsd.org/"></ulink>.</para>
         </answer>
       </qandaentry>
 
@@ -433,12 +436,12 @@
             only well-tested bug fixes and other small incremental
             enhancements.  FreeBSD-CURRENT, on the other hand, has
             been one unbroken line since 2.0 was released, leading
-            towards 6.2-RELEASE and beyond.  Just before 6.0-RELEASE, the
+            towards &rel.current;-RELEASE and beyond. For more detailed information on branches
-            6-STABLE branch was created, and
-            &os.current; became 7-CURRENT.  For more detailed information,
             see <quote><ulink url="&url.articles.releng;/release-proc.html#REL-BRANCH">
 		FreeBSD Release Engineering:
-		Creating the Release Branch</ulink></quote>.</para>
+		Creating the Release Branch</ulink></quote>, the status of the
+		branches and the upcoming release schedule can be found on the <ulink
+		  url="http://www.FreeBSD.org/releng">Release Engineering Information</ulink> page.</para>
 
           <para>The 2.2-STABLE branch was retired with the release of 2.2.8.
             The 3-STABLE branch has ended with the release of 3.5.1, the
@@ -467,8 +470,9 @@
         </question>
 
         <answer>
-	  <para>The &a.re; releases a new version of FreeBSD about every
+	  <para>The &a.re; releases a new major version of &os; about every
-	    four months, on average.  Release dates are announced well in
+	    18 months and a new minor version about every
+	    8 months, on average. Release dates are announced well in
 	    advance, so that the people working on the system know
 	    when their projects need to be finished and tested.  
 	    A testing period precedes each release, in order to ensure
@@ -533,7 +537,7 @@
             <listitem>
               <para><ulink
 		url="&url.base;/snapshots/">
-                Snapshot</ulink> releases are made daily for the
+                Snapshot</ulink> releases are made monthly for the
 		<link linkend="current">-CURRENT</link> and <link
 		linkend="stable">-STABLE</link> branch, these being
                 of service purely to bleeding-edge testers and
@@ -562,7 +566,7 @@
           <para>The Problem Report database of all user change requests
             may be queried by using our web-based PR
             <ulink
-            url="http://www.FreeBSD.org/cgi/query-pr-summary.cgi?query">
+            url="http://www.FreeBSD.org/cgi/query-pr.cgi?query">
             query</ulink>
             interface.</para>