diff --git a/en_US.ISO8859-1/books/faq/book.sgml b/en_US.ISO8859-1/books/faq/book.sgml
index f67100065f..692bcd4a72 100644
--- a/en_US.ISO8859-1/books/faq/book.sgml
+++ b/en_US.ISO8859-1/books/faq/book.sgml
@@ -559,18 +559,6 @@
         </answer>
       </qandaentry>
 
-      <qandaentry>
-        <question id="howto-mirror">
-          <para>How do I set up a FreeBSD mirror?</para>
-        </question>
-
-	<answer>
-	  <para>Information on setting up a FreeBSD mirror can be
-	    found in the <ulink url="&url.articles.hubs;/">Mirroring
-	    FreeBSD</ulink> article.</para>
-	</answer>
-      </qandaentry>
-
       <qandaentry>
         <question id="access-pr">
           <para>How do I access the Problem Report database?</para>
@@ -597,35 +585,6 @@
         </answer>
       </qandaentry>
 
-      <qandaentry>
-        <question id="become-web-mirror">
-          <para>How do I become a FreeBSD Web mirror?</para>
-        </question>
-
-        <answer>
-          <para>There are multiple ways to mirror the Web pages.</para>
-
-          <itemizedlist>
-            <listitem>
-              <para>You can retrieve the formatted files from a
-                FreeBSD CVSup server using the application
-                <filename role="package">net/cvsup</filename>.  The file
-                <filename>/usr/share/examples/cvsup/www-supfile</filename>
-                contains an example CVSup configuration file for web
-                mirrors.</para>
-            </listitem>
-
-            <listitem>
-              <para>You can download the web site source code from any
-                FreeBSD FTP server using your favorite ftp mirror
-                tool.  Keep in mind that you have to build these
-                sources before publishing them.  Start mirroring at
-                <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-current/www/"></ulink>.</para>
-            </listitem>
-          </itemizedlist>
-        </answer>
-      </qandaentry>
-
       <qandaentry>
         <question id="other-info-sources">
           <para>What other sources of information are there?</para>
@@ -10758,76 +10717,16 @@ raisechar=^^</programlisting>
       </qandaentry>
 
       <qandaentry>
-        <question id="define-MFC">
-          <para>What does <acronym>MFC</acronym> mean?</para>
+        <question id="glossary">
+          <para>I have seen an acronym or other term on the mailing
+	  lists and I do not understand what it means.  Where should
+	  I look?</para>
         </question>
 
         <answer>
-          <para>MFC is an acronym for <quote>Merged From -CURRENT</quote>.
-            It is used in the CVS logs to denote when a change was
-            migrated from the CURRENT to the STABLE branches.</para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry>
-        <question id="define-BSD">
-          <para>What does <acronym>BSD</acronym> mean?</para>
-        </question>
-
-        <answer>
-          <para>It stands for something in a secret language that only
-            members can know. It does not translate literally but it is ok
-            to tell you that BSD's translation is something between,
-            <quote>Formula-1 Racing Team</quote>, <quote>Penguins are
-            tasty snacks</quote>, and <quote>We have a better sense of
-            humor than &linux;</quote>. :-)</para>
-
-          <para>Seriously, BSD is an acronym for <quote>Berkeley
-            Software Distribution</quote>, which is the name the
-            Berkeley <acronym>CSRG</acronym> (Computer Systems Research
-            Group) chose for their &unix; distribution way back when.</para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry>
-	<question id="define-pola">
-	  <para>What does <acronym>POLA</acronym> mean?</para>
-	</question>
-
-	<answer>
-	  <para>Principle of Least Astonishment.  It means that as
-	    FreeBSD evolves, changes visible to the user should be
-	    kept as unsurprising as possible.  For example,
-	    arbitrarily rearranging system startup variables in
-	    <filename>/etc/defaults/rc.conf</filename> violates POLA.
-	    Developers consider POLA when contemplating user-visible
-	    system changes.</para>
-	</answer>
-      </qandaentry>
-
-      <qandaentry>
-        <question id="define-repocopy">
-          <para>What is a repo-copy?</para>
-        </question>
-
-        <answer>
-          <para>A repo-copy (which is a short form of <quote>repository
-            copy</quote>) refers to the direct copying of files within
-            the CVS repository.</para>
-
-          <para>Without a repo-copy, if a file needed to be copied or
-            moved to another place in the repository, the committer would
-            run <command>cvs add</command> to put the file in its new
-            location, and then <command>cvs rm</command> on the old file
-            if the old copy was being removed.</para>
-
-          <para>The disadvantage of this method is that the history
-            (i.e. the entries in the CVS logs) of the file would not be
-            copied to the new location. As the FreeBSD Project considers
-            this history very useful, a repository copy is often used
-            instead. This is a process where one of the repository meisters
-            will copy the files directly within the repository, rather than
-            using the &man.cvs.1; program.</para>
+	  <para>Please see the <ulink
+	    url="&url.books.handbook;/freebsd-glossary.html">
+	    &os Glossary</ulink>.</para>
         </answer>
       </qandaentry>