diff --git a/en_US.ISO8859-1/books/faq/book.sgml b/en_US.ISO8859-1/books/faq/book.sgml
index fdb2c503fd..a6733357c1 100644
--- a/en_US.ISO8859-1/books/faq/book.sgml
+++ b/en_US.ISO8859-1/books/faq/book.sgml
@@ -15,7 +15,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/books/faq/book.sgml,v 1.112 2000/10/26 23:07:29 nik Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/books/faq/book.sgml,v 1.113 2000/10/28 21:26:43 nik Exp $</pubdate>
 
     <abstract>
       <para>This is the FAQ for FreeBSD versions 2.X, 3.X, and 4.X.
@@ -5710,14 +5710,36 @@ C:\="DOS"</programlisting>
 
               <listitem>
                 <para>Put the quota file on the file system that the quotas
-                  are to be enforced on. ie:
+                  are to be enforced on. ie:</para>
 
-                  <programlisting>FS      QUOTA FILE
-/usr    /usr/admin/quotas
-/home   /home/admin/quotas
-...</programlisting></para>
+		<informaltable frame="none">
+		  <tgroup cols="2">
+		    <thead>
+		      <row>
+			<entry>Filesystem</entry>
+			<entry>Quota file</entry>
+		      </row>
+		    </thead>
 
-              </listitem>
+		    <tbody>
+		      <row>
+			<entry><filename>/usr</filename></entry>
+			<entry><filename>/usr/admin/quotas</filename></entry>
+		      </row>
+
+		      <row>
+			<entry><filename>/home</filename></entry>
+			<entry><filename>/home/admin/quotas</filename></entry>
+		      </row>
+
+		      <row>
+			<entry>&hellip;</entry>
+			<entry>&hellip;</entry>
+		      </row>
+		    </tbody>
+		  </tgroup>
+		</informaltable>
+	      </listitem>
             </orderedlist></para>
 
         </answer>
@@ -5962,15 +5984,14 @@ rewrite: ruleset  0 returns: $# uucp-dom $@ if-bus $: foo \
             dialup <emphasis remap=bf>ppp</emphasis> connection to the
             internet, you will probably be given a mailbox on your ISPs
             mail server. Lets assume your ISPs domain is
-            <filename>myISP.com</filename>, and that your user name is
-            <emphasis remap=tt>user</emphasis>. Lets also assume you've
-            called your machine <filename>bsd.home</filename> and that your
+            <hostid role="domainname">myISP.com</hostid>, and that your user name is
+            <username>user</username>. Lets also assume you've
+            called your machine <hostid role="fqdn">bsd.home</hostid> and that your
             ISP has told you that you may use
-            <filename>relay.myISP.com</filename> as a mail relay.</para>
+            <hostid role="fqdn">relay.myISP.com</hostid> as a mail relay.</para>
 
           <para>In order to retrieve mail from your mailbox, you'll need
-            to install a retrieval agent. <emphasis
-            remap=bf>Fetchmail</emphasis> is a good choice as it supports
+            to install a retrieval agent. <application>Fetchmail</application> is a good choice as it supports
             many different protocols. Usually, POP3 will be provided by
             your ISP. If you've chosen to use user-ppp, you can
             automatically fetch your mail when a connection to the 'net is
@@ -5991,22 +6012,22 @@ rewrite: ruleset  0 returns: $# uucp-dom $@ if-bus $: foo \
             is established.</para>
 
           <para>I'm assuming that you have an account for
-            <emphasis remap=tt>user</emphasis> on
-            <filename>bsd.home</filename>. In the home directory of
-            <emphasis remap=tt>user</emphasis> on
-            <filename>bsd.home</filename>, create a
+            <username>user</username> on
+            <hostid role="fqdn">bsd.home</hostid>. In the home directory of
+            <username>user</username> on
+            <hostid role="fqdn">bsd.home</hostid>, create a
             <filename>.fetchmailrc</filename> file:</para>
 
           <programlisting>poll myISP.com protocol pop3 fetchall pass MySecret</programlisting>
 
           <para>Needless to say, this file should not be readable by
-            anyone except <emphasis remap=tt>user</emphasis> as it contains
-            the password <emphasis remap=tt>MySecret</emphasis>.</para>
+            anyone except <username>user</username> as it contains
+            the password <literal>MySecret</literal>.</para>
 
           <para>In order to send mail with the correct
-            <emphasis remap=bf>from:</emphasis> header, you must tell
-            sendmail to use <email>user@myISP.com</email> rather than
-            <email>user@bsd.home</email>. You may also wish to tell
+            <literal>from:</literal> header, you must tell
+            sendmail to use <literal>user@myISP.com</literal> rather than
+            <literal>user@bsd.home</literal>. You may also wish to tell
             sendmail to send all mail via
             <filename>relay.myISP.com</filename>, allowing quicker mail
             transmission.</para>
diff --git a/en_US.ISO_8859-1/books/faq/book.sgml b/en_US.ISO_8859-1/books/faq/book.sgml
index fdb2c503fd..a6733357c1 100644
--- a/en_US.ISO_8859-1/books/faq/book.sgml
+++ b/en_US.ISO_8859-1/books/faq/book.sgml
@@ -15,7 +15,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/books/faq/book.sgml,v 1.112 2000/10/26 23:07:29 nik Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/books/faq/book.sgml,v 1.113 2000/10/28 21:26:43 nik Exp $</pubdate>
 
     <abstract>
       <para>This is the FAQ for FreeBSD versions 2.X, 3.X, and 4.X.
@@ -5710,14 +5710,36 @@ C:\="DOS"</programlisting>
 
               <listitem>
                 <para>Put the quota file on the file system that the quotas
-                  are to be enforced on. ie:
+                  are to be enforced on. ie:</para>
 
-                  <programlisting>FS      QUOTA FILE
-/usr    /usr/admin/quotas
-/home   /home/admin/quotas
-...</programlisting></para>
+		<informaltable frame="none">
+		  <tgroup cols="2">
+		    <thead>
+		      <row>
+			<entry>Filesystem</entry>
+			<entry>Quota file</entry>
+		      </row>
+		    </thead>
 
-              </listitem>
+		    <tbody>
+		      <row>
+			<entry><filename>/usr</filename></entry>
+			<entry><filename>/usr/admin/quotas</filename></entry>
+		      </row>
+
+		      <row>
+			<entry><filename>/home</filename></entry>
+			<entry><filename>/home/admin/quotas</filename></entry>
+		      </row>
+
+		      <row>
+			<entry>&hellip;</entry>
+			<entry>&hellip;</entry>
+		      </row>
+		    </tbody>
+		  </tgroup>
+		</informaltable>
+	      </listitem>
             </orderedlist></para>
 
         </answer>
@@ -5962,15 +5984,14 @@ rewrite: ruleset  0 returns: $# uucp-dom $@ if-bus $: foo \
             dialup <emphasis remap=bf>ppp</emphasis> connection to the
             internet, you will probably be given a mailbox on your ISPs
             mail server. Lets assume your ISPs domain is
-            <filename>myISP.com</filename>, and that your user name is
-            <emphasis remap=tt>user</emphasis>. Lets also assume you've
-            called your machine <filename>bsd.home</filename> and that your
+            <hostid role="domainname">myISP.com</hostid>, and that your user name is
+            <username>user</username>. Lets also assume you've
+            called your machine <hostid role="fqdn">bsd.home</hostid> and that your
             ISP has told you that you may use
-            <filename>relay.myISP.com</filename> as a mail relay.</para>
+            <hostid role="fqdn">relay.myISP.com</hostid> as a mail relay.</para>
 
           <para>In order to retrieve mail from your mailbox, you'll need
-            to install a retrieval agent. <emphasis
-            remap=bf>Fetchmail</emphasis> is a good choice as it supports
+            to install a retrieval agent. <application>Fetchmail</application> is a good choice as it supports
             many different protocols. Usually, POP3 will be provided by
             your ISP. If you've chosen to use user-ppp, you can
             automatically fetch your mail when a connection to the 'net is
@@ -5991,22 +6012,22 @@ rewrite: ruleset  0 returns: $# uucp-dom $@ if-bus $: foo \
             is established.</para>
 
           <para>I'm assuming that you have an account for
-            <emphasis remap=tt>user</emphasis> on
-            <filename>bsd.home</filename>. In the home directory of
-            <emphasis remap=tt>user</emphasis> on
-            <filename>bsd.home</filename>, create a
+            <username>user</username> on
+            <hostid role="fqdn">bsd.home</hostid>. In the home directory of
+            <username>user</username> on
+            <hostid role="fqdn">bsd.home</hostid>, create a
             <filename>.fetchmailrc</filename> file:</para>
 
           <programlisting>poll myISP.com protocol pop3 fetchall pass MySecret</programlisting>
 
           <para>Needless to say, this file should not be readable by
-            anyone except <emphasis remap=tt>user</emphasis> as it contains
-            the password <emphasis remap=tt>MySecret</emphasis>.</para>
+            anyone except <username>user</username> as it contains
+            the password <literal>MySecret</literal>.</para>
 
           <para>In order to send mail with the correct
-            <emphasis remap=bf>from:</emphasis> header, you must tell
-            sendmail to use <email>user@myISP.com</email> rather than
-            <email>user@bsd.home</email>. You may also wish to tell
+            <literal>from:</literal> header, you must tell
+            sendmail to use <literal>user@myISP.com</literal> rather than
+            <literal>user@bsd.home</literal>. You may also wish to tell
             sendmail to send all mail via
             <filename>relay.myISP.com</filename>, allowing quicker mail
             transmission.</para>