From 2be907e9e6388a846ca701845277c10edbca5c3c Mon Sep 17 00:00:00 2001
From: Warren Block <wblock@FreeBSD.org>
Date: Wed, 10 Oct 2012 23:28:30 +0000
Subject: [PATCH] Fix some straggling screen tags and change one set to the
 more appropriate programlisting.  Translators please note that these are
 content changes that should be included in translated documents.

---
 .../books/handbook/mirrors/chapter.xml           | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
index 89f757fe65..f30a2a721e 100644
--- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
@@ -498,8 +498,7 @@ SSH2 HostKey: 1024 e8:3b:29:7b:ca:9f:ac:e9:45:cb:c8:17:ae:9b:eb:55 /etc/ssh/ssh_
 	<screen>&prompt.user; <userinput>setenv CVSROOT :pserver:anoncvs@anoncvs.tw.FreeBSD.org:/home/ncvs</userinput>
 &prompt.user; <userinput>cvs login</userinput>
 <emphasis>At the prompt, enter any word for</emphasis> <quote>password</quote>.
-&prompt.user; <userinput>cvs co ls</userinput>
-	</screen>
+&prompt.user; <userinput>cvs co ls</userinput></screen>
       </example>
 
       <example>
@@ -520,8 +519,7 @@ Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hos
 	<screen>&prompt.user; <userinput>setenv CVSROOT :pserver:anoncvs@anoncvs.tw.FreeBSD.org:/home/ncvs</userinput>
 &prompt.user; <userinput>cvs login</userinput>
 <emphasis>At the prompt, enter any word for</emphasis> <quote>password</quote>.
-&prompt.user; <userinput>cvs co -rRELENG_8 ls</userinput>
-	</screen>
+&prompt.user; <userinput>cvs co -rRELENG_8 ls</userinput></screen>
       </example>
 
       <example>
@@ -531,8 +529,7 @@ Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hos
 	<screen>&prompt.user; <userinput>setenv CVSROOT :pserver:anoncvs@anoncvs.tw.FreeBSD.org:/home/ncvs</userinput>
 &prompt.user; <userinput>cvs login</userinput>
 <emphasis>At the prompt, enter any word for</emphasis> <quote>password</quote>.
-&prompt.user; <userinput>cvs rdiff -u -rRELENG_8_0_0_RELEASE -rRELENG_8_1_0_RELEASE ls</userinput>
-	</screen>
+&prompt.user; <userinput>cvs rdiff -u -rRELENG_8_0_0_RELEASE -rRELENG_8_1_0_RELEASE ls</userinput></screen>
       </example>
 
       <example>
@@ -543,8 +540,7 @@ Warning: Permanently added 'anoncvs1.freebsd.org' (DSA) to the list of known hos
 &prompt.user; <userinput>cvs login</userinput>
 <emphasis>At the prompt, enter any word for</emphasis> <quote>password</quote>.
 &prompt.user; <userinput>cvs co modules</userinput>
-&prompt.user; <userinput>more modules/modules</userinput>
-	</screen>
+&prompt.user; <userinput>more modules/modules</userinput></screen>
       </example>
     </sect2>
 
@@ -1373,7 +1369,7 @@ src-all</programlisting>
 	  translation of documentation, you can put the following in
 	  your <filename>refuse</filename> file:</para>
 
-	<screen>doc/bn_*
+	<programlisting>doc/bn_*
 doc/da_*
 doc/de_*
 doc/el_*
@@ -1390,7 +1386,7 @@ doc/pt_*
 doc/ru_*
 doc/sr_*
 doc/tr_*
-doc/zh_*</screen>
+doc/zh_*</programlisting>
 
 	<para>and so forth for the other languages (you can find the
 	  full list by browsing the