diff --git a/en_US.ISO8859-1/books/handbook/mail/chapter.sgml b/en_US.ISO8859-1/books/handbook/mail/chapter.sgml
index 7f263244fe..518bfc0986 100644
--- a/en_US.ISO8859-1/books/handbook/mail/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/mail/chapter.sgml
@@ -2228,23 +2228,23 @@ user "john", with password "XXXXX", is "myth" here;</programlisting>
       must reside in a user's the home directory.<para>
 
     <para>The majority of these rules can also be found in the
-      <quote>procmailex</quote> manual page.</para>
+      &man.procmailex.5; manual page.</para>
 
-    <para>Forward all mail from <quote>user@example.com</quote> to an
-      external address of <quote>goodmail@example2.com</quote>:</para>
+    <para>Forward all mail from <literal>user@example.com</literal> to an
+      external address of <literal>goodmail@example2.com</literal>:</para>
 
     <programlisting>:0
 * ^From.*user@example.com
 ! goodmail@example2.com</programlisting>
 
     <para>Forward all mails shorter than 1000 bytes to an external
-      address of <quote>goodmail@example2.com</quote>:</para>
+      address of <literal>goodmail@example2.com</literal>:</para>
 
     <programlisting>:0
 * < 1000
 ! goodmail@example2.com</programlisting>
 
-    <para>Send all mail sent to <quote>alternate@example.com</quote>
+    <para>Send all mail sent to <literal>alternate@example.com</literal>
       into a mailbox called <filename>alternate</filename>.</para>
 
     <programlisting>:0
@@ -2258,7 +2258,7 @@ alternate</programlisting>
 ^Subject:.*Spam
 /dev/null</programlisting>
 
-    <para>A useful recipe that parses incoming &os;.org mailing lists
+    <para>A useful recipe that parses incoming <hostid role="domainname">&os;.org</hostid> mailing lists
       and places each list in it's own mailbox.</para>
 
     <programlisting>:0