diff --git a/en_US.ISO8859-1/books/faq/book.sgml b/en_US.ISO8859-1/books/faq/book.sgml
index bfa62df288..c513d5faa4 100644
--- a/en_US.ISO8859-1/books/faq/book.sgml
+++ b/en_US.ISO8859-1/books/faq/book.sgml
@@ -6221,7 +6221,7 @@ options    SYSVMSG          # enable for messaging</programlisting>
             preprocessing, where the actual hand-crafted configuration is
             on a higher abstraction level. You should use the configuration
             files under
-            <filename>/usr/src/usr.sbin/sendmail/cf</filename></para>
+            <filename>/usr/src/usr.sbin/sendmail/cf</filename>.</para>
 
           <para>If you did not install your system with full sources,
             the sendmail config stuff has been broken out into a separate
@@ -6252,22 +6252,22 @@ options    SYSVMSG          # enable for messaging</programlisting>
 
           <screen>&prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail/cf/cf</userinput>
 &prompt.root; <userinput>make foo.cf</userinput>
-&prompt.root; <userinput>cp foo.cf /etc/sendmail.cf</userinput></screen>
+&prompt.root; <userinput>cp foo.cf /etc/mail/sendmail.cf</userinput></screen>
 
           <para>A typical <filename>.mc</filename> file might look
             like:</para>
 
 
-          <programlisting>include(`../m4/cf.m4')
-VERSIONID(`<replaceable>Your version number</replaceable>')
+          <programlisting>VERSIONID(`<replaceable>Your version number</replaceable>')
 OSTYPE(bsd4.4)
 
-FEATURE(nodns)
+FEATURE(accept_unresolvable_domains)
 FEATURE(nocanonify)
-FEATURE(mailertable)
+FEATURE(mailertable, `hash -o /etc/mail/mailertable')
 
 define(`UUCP_RELAY', <replaceable>your.uucp.relay</replaceable>)
 define(`UUCP_MAX_SIZE', 200000)
+define(`confDONT_PROBE_INTERFACES')
 
 MAILER(local)
 MAILER(smtp)
@@ -6276,8 +6276,8 @@ MAILER(uucp)
 Cw    <replaceable>your.alias.host.name</replaceable>
 Cw    <replaceable>youruucpnodename.UUCP</replaceable></programlisting>
 
-          <para>The <literal>nodns</literal> and
-            <literal>nocanonify</literal> features will prevent any usage
+          <para>The lines containing <literal>accept_unresolvable_domains</literal>,
+            <literal>nocanonify</literal>, and <literal>confDONT_PROBE_INTERFACES</literal> features will prevent any usage
             of the DNS during mail delivery.  The
             <literal>UUCP_RELAY</literal> clause is needed for bizarre
             reasons, do not ask.  Simply put an Internet hostname there that
@@ -6285,11 +6285,18 @@ Cw    <replaceable>youruucpnodename.UUCP</replaceable></programlisting>
             you will enter the mail relay of your ISP there.</para>
 
           <para>Once you have got this, you need this file called
-            <filename>/etc/mailertable</filename>.  A typical example of
-            this gender again:</para>
+            <filename>/etc/mail/mailertable</filename>.  If have only
+            one link to the outside that is used for all your mails,
+            the following file will be enough:</para>
 
           <programlisting>#
-# makemap hash /etc/mailertable.db &lt; /etc/mailertable
+# makemap hash /etc/mail/mailertable.db &lt; /etc/mail/mailertable
+.                             uucp-dom:<replaceable>your.uucp.relay</replaceable></programlisting>
+
+          <para>A more complex example might look like this:</para>
+
+          <programlisting>#
+# makemap hash /etc/mail/mailertable.db &lt; /etc/mail/mailertable
 #
 horus.interface-business.de   uucp-dom:horus
 .interface-business.de        uucp-dom:if-bus
@@ -6336,11 +6343,10 @@ if-bus.UUCP                   uucp-dom:if-bus
           <screen>&prompt.user; <userinput>sendmail -bt</userinput>
 ADDRESS TEST MODE (ruleset 3 NOT automatically invoked)
 Enter &lt;ruleset&gt; &lt;address&gt;
-<prompt>&gt;</prompt> <userinput>0 foo@interface-business.de</userinput>
-rewrite: ruleset  0   input: foo @ interface-business . de
+<prompt>&gt;</prompt> <userinput>3,0 foo@example.com</userinput>
+canonify           input: foo @ example . com
 ...
-rewrite: ruleset  0 returns: $# uucp-dom $@ if-bus $: foo \
-&lt; @ interface-business . de &gt;
+parse            returns: $# uucp-dom $@ <replaceable>your.uucp.relay</replaceable> $: foo &lt; @ example . com . &gt;
 <prompt>&gt;</prompt> <userinput>^D</userinput></screen>
         </answer>
       </qandaentry>