From 70e0714c1ae08209eb8346b29e238e983c311ec4 Mon Sep 17 00:00:00 2001
From: Martin Heinen <mheinen@FreeBSD.org>
Date: Sun, 11 Apr 2004 19:38:56 +0000
Subject: [PATCH] Add userinput tags to the mail(1) screens. Fix line breaks in
 the reply to example.

---
 en_US.ISO8859-1/books/handbook/mail/chapter.sgml | 16 +++++++++-------
 1 file changed, 9 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 14ac0800e3..499f5d2738 100644
--- a/en_US.ISO8859-1/books/handbook/mail/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/mail/chapter.sgml
@@ -1799,7 +1799,7 @@ sasl_pwcheck_program="/usr/local/sbin/pwcheck"</programlisting>
 	that should be displayed.  In this example, we will read the
 	first email:</para>
 
-      <screen>& t 1
+      <screen>& <userinput>t 1</userinput>
 Message 1:
 From root@localhost  Mon Mar  8 14:05:52 2004
 X-Original-To: marcs@localhost
@@ -1829,10 +1829,12 @@ This is a test message, please reply if you receive it.</screen>
 	single <keycap>.</keycap> on a new line.  An example can be seen
 	below:</para>
 
-      <screen>& R 1 To: root@localhost Subject: Re: test
+      <screen>& <userinput>R 1</userinput>
+To: root@localhost
+Subject: Re: test
 
-Thank you, I did get your email.
-.
+<userinput>Thank you, I did get your email.
+.</userinput>
 EOT</screen>
 
       <para>In order to send new email, the <keycap>m</keycap>
@@ -1844,11 +1846,11 @@ EOT</screen>
 	be specified by putting a single <keycap>.</keycap> on a new
 	line.</para>
 
-      <screen>& mail root@localhost
-Subject: I mastered mail
+      <screen>& <userinput>mail root@localhost</userinput>
+Subject: <userinput>I mastered mail
 
 Now I can send and receive email using mail ... :)
-.
+.</userinput>
 EOT</screen>
 
       <para>While inside the <command>mail</command> utility, the