From d143484db05e0de88b8c2333f1aa6c430d497b7f Mon Sep 17 00:00:00 2001
From: Marc Fonvieille <blackend@FreeBSD.org>
Date: Sat, 2 Aug 2003 12:31:57 +0000
Subject: [PATCH] Add application tags for sendmail, and fix some tagging for
 fetchmail.

---
 en_US.ISO8859-1/books/handbook/mail/chapter.sgml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/en_US.ISO8859-1/books/handbook/mail/chapter.sgml b/en_US.ISO8859-1/books/handbook/mail/chapter.sgml
index 52af7c9217..97cebcf810 100644
--- a/en_US.ISO8859-1/books/handbook/mail/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/mail/chapter.sgml
@@ -1132,13 +1132,13 @@ freefall		MX	20	who.cdrom.com</programlisting>
   <sect1 id="SMTP-UUCP">
   <title>SMTP with UUCP</title>
 
-    <para>The sendmail configuration that ships with FreeBSD is
+    <para>The <application>sendmail</application> configuration that ships with FreeBSD is
       designed for sites that connect directly to the Internet.  Sites
       that wish to exchange their mail via UUCP must install another
       sendmail configuration file.</para>
 
     <para>Tweaking <filename>/etc/mail/sendmail.cf</filename> manually
-      is an advanced topic. Sendmail version 8 generates config files
+      is an advanced topic. <application>sendmail</application> version 8 generates config files
       via &man.m4.1; preprocessing, where the actual configuration
       occurs on a higher abstraction level. The &man.m4.1
       configuration files can be found under
@@ -1160,7 +1160,7 @@ contrib/sendmail</userinput></screen>
 
     <para>The best way to support UUCP delivery is to use the
       <literal>mailertable</literal> feature.  This creates a database
-      that sendmail can use to make routing decisions.</para>
+      that <application>sendmail</application> can use to make routing decisions.</para>
 
     <para>First, you have to create your <filename>.mc</filename>
       file.  The directory
@@ -1252,7 +1252,7 @@ if-bus.UUCP                   uucp-dom:if-bus
 
     <para>Final hint: if you are uncertain whether some particular
       mail routing would work, remember the <option>-bt</option>
-      option to sendmail. It starts sendmail in <emphasis>address test
+      option to <application>sendmail</application>. It starts <application>sendmail</application> in <emphasis>address test
       mode</emphasis>; simply enter <literal>3,0</literal>, followed
       by the address you wish to test for the mail routing.  The last
       line tells you the used internal mail agent, the destination
@@ -1274,7 +1274,7 @@ parse            returns: $# uucp-dom $@ <replaceable>your.uucp.relay</replaceab
 
     <para>If you have a static IP address, you should not need to
       adjust anything from the defaults.  Set your host name to your
-      assigned Internet name and sendmail will do the rest.</para>
+      assigned Internet name and <application>sendmail</application> will do the rest.</para>
 
     <para>If you have a dynamically assigned IP number and use a
       dialup PPP connection to the Internet, you will probably have a
@@ -1286,7 +1286,7 @@ parse            returns: $# uucp-dom $@ <replaceable>your.uucp.relay</replaceab
       role="fqdn">relay.example.net</hostid> as a mail relay.</para>
 
     <para>In order to retrieve mail from your mailbox, you must
-      install a retrieval agent. <application>Fetchmail</application>
+      install a retrieval agent. The <application>fetchmail</application> utility
       is a good choice as it supports many different protocols.
       Usually, your ISP will provide POP3. If you are using user-PPP,
       you can automatically fetch your mail when an Internet
@@ -1301,7 +1301,7 @@ parse            returns: $# uucp-dom $@ <replaceable>your.uucp.relay</replaceab
       want to have <application>sendmail</application> process your
       mailqueue as soon as your Internet connection is established.
       To do this, put this command after the
-      <application>fetchmail</application> command in
+      <command>fetchmail</command> command in
       <filename>/etc/ppp/ppp.linkup</filename>.</para>
 
     <programlisting>  !bg su user -c "sendmail -q"</programlisting>