From 27cbcc36356289f0a4747fd11424788432a90be9 Mon Sep 17 00:00:00 2001
From: Giorgos Keramidas <keramida@FreeBSD.org>
Date: Sat, 31 Aug 2002 09:59:41 +0000
Subject: [PATCH] Collapse multiple, subsequent <screen>'s to single,
 multi-line elements.

---
 .../articles/java-tomcat/article.sgml         | 71 +++++++------------
 1 file changed, 27 insertions(+), 44 deletions(-)

diff --git a/en_US.ISO8859-1/articles/java-tomcat/article.sgml b/en_US.ISO8859-1/articles/java-tomcat/article.sgml
index c28562cd2c..2adceabd63 100644
--- a/en_US.ISO8859-1/articles/java-tomcat/article.sgml
+++ b/en_US.ISO8859-1/articles/java-tomcat/article.sgml
@@ -253,25 +253,21 @@
       you need to start by building <filename
       role="package">java/linux-jdk13</filename>:</para>
 
-    <screen>&prompt.root; cd /usr/ports/archivers/gtar; make all install clean</screen>
-
-    <screen>&prompt.root; cd /usr/ports/archivers/unzip; make all install clean</screen>
-
-    <screen>&prompt.root; cd /usr/ports/archivers/zip; make all install clean</screen>
+    <screen>&prompt.root; cd /usr/ports/archivers/gtar; make all install clean
+&prompt.root; cd /usr/ports/archivers/unzip; make all install clean
+&prompt.root; cd /usr/ports/archivers/zip; make all install clean</screen>
 
     <para>And finally:</para>
 
-    <screen>&prompt.root; cd /usr/ports/java/linux-jdk13</screen>
-
-    <screen>&prompt.root; make all install clean</screen>
+    <screen>&prompt.root; cd /usr/ports/java/linux-jdk13
+&prompt.root; make all install clean</screen>
 
     <para>Once you have built <filename
       role="package">java/linux-jdk13</filename>, you need to test it, to
       make sure it works as intended.  To do that:</para>
 
-    <screen>&prompt.root; cd /usr/local/linux-jdk1.3.1/bin</screen>
-
-    <screen>&prompt.root; ./java -version</screen>
+    <screen>&prompt.root; cd /usr/local/linux-jdk1.3.1/bin
+&prompt.root; ./java -version</screen>
 
     <para>The output of the above command should be as follows:</para>
 
@@ -281,9 +277,8 @@ Classic VM (build 1.3.1_02-b02, green threads, nojit)</programlisting>
 
     <para>If you did not get the correct response, you need to:</para>
 
-    <screen>&prompt.root; cd /usr/ports/java/linux-jdk13</screen>
-
-    <screen>&prompt.root; make deinstall</screen>
+    <screen>&prompt.root; cd /usr/ports/java/linux-jdk13
+&prompt.root; make deinstall</screen>
 
     <para>And make sure that <filename>/usr/local</filename> does not
       contain a <filename>linux-jdk1.3.1</filename> directory.  If you
@@ -436,9 +431,8 @@ MD5 (bsd-jdk131-patches-6.tar.gz) = 9cade10b81d6034fdd2176bef32bdbf9</programlis
 	    JDK (the below example points to a native build of the
 	    JDK):</para>
 
-	  <screen>&prompt.root; setenv JAVA_HOME /usr/local/jdk1.3.1 (for C Shells)</screen>
-
-	  <screen>&prompt.root; export JAVA_HOME=/usr/local/jdk1.3.1 (for Bourne Shells)</screen>
+	  <screen>&prompt.root; setenv JAVA_HOME /usr/local/jdk1.3.1 (for C Shells)
+&prompt.root; export JAVA_HOME=/usr/local/jdk1.3.1 (for Bourne Shells)</screen>
 
 	  <para>This environment variable should be made permanent by
 	    adding it into either <filename>.profile</filename> or
@@ -473,15 +467,11 @@ MD5 (bsd-jdk131-patches-6.tar.gz) = 9cade10b81d6034fdd2176bef32bdbf9</programlis
 	    directory to <filename>tomcat-4.0</filename> for ease of
 	    reference:</para>
 
-	  <screen>&prompt.root; cd /usr/local</screen>
-
-	  <screen>&prompt.root; gtar zxvf jakarta-tomcat-4.0.3.tar.gz</screen>
-
-	  <screen>&prompt.root; ls jakarta*</screen>
-
-	  <screen>jakarta-tomcat-4.0.3</screen>
-
-	  <screen>&prompt.root; mv jakarta-tomcat-4.0.3 tomcat-4.0</screen>
+	  <screen>&prompt.root; cd /usr/local
+&prompt.root; gtar zxvf jakarta-tomcat-4.0.3.tar.gz
+&prompt.root; ls jakarta*
+jakarta-tomcat-4.0.3
+&prompt.root; mv jakarta-tomcat-4.0.3 tomcat-4.0</screen>
 
 	  <para>You can remove the
 	    <filename>jakarta-tomcat-4.0.3.tar.gz</filename> at your
@@ -514,18 +504,16 @@ MD5 (bsd-jdk131-patches-6.tar.gz) = 9cade10b81d6034fdd2176bef32bdbf9</programlis
       <para>Now that we have finished installing Tomcat.  The following
 	example shows how to start the Tomcat server:</para>
 
-      <screen>&prompt.root; cd /usr/local/tomcat-4.0/bin</screen>
-
-      <screen>&prompt.root; ./startup.sh  (for starting Tomcat)</screen>
+      <screen>&prompt.root; cd /usr/local/tomcat-4.0/bin
+&prompt.root; ./startup.sh  (for starting Tomcat)</screen>
 
       <para>You can test if your Tomcat server has started by visiting
 	the following URL: <literal>http://127.0.0.1:8080</literal> or
 	<literal>http://localhost:8080</literal>.  To stop
 	Tomcat:</para>
 
-      <screen>&prompt.root; cd /usr/local/tomcat-4.0/bin</screen>
-
-      <screen>&prompt.root; ./shutdown.sh</screen>
+      <screen>&prompt.root; cd /usr/local/tomcat-4.0/bin
+&prompt.root; ./shutdown.sh</screen>
 
       <para>(for stopping Tomcat)</para>
 
@@ -535,9 +523,8 @@ MD5 (bsd-jdk131-patches-6.tar.gz) = 9cade10b81d6034fdd2176bef32bdbf9</programlis
 	directory; if you would like to start Tomcat automatically at
 	boot-time run:</para>
 
-      <screen>&prompt.root; cd /usr/local/etc/rc.d</screen>
-
-      <screen>&prompt.root; ln -s /usr/local/tomcat-4.0/bin/catalina.sh</screen>
+      <screen>&prompt.root; cd /usr/local/etc/rc.d
+&prompt.root; ln -s /usr/local/tomcat-4.0/bin/catalina.sh</screen>
 
       <para>Edit the <filename>catalina.sh</filename>, and add the
 	following at the beginning of the file (after the comment
@@ -552,15 +539,11 @@ MD5 (bsd-jdk131-patches-6.tar.gz) = 9cade10b81d6034fdd2176bef32bdbf9</programlis
 	port will be changed to 80, assuming there is no service running
 	on that port.</para>
 
-      <screen>&prompt.root; cd /usr/local/tomcat-4.0/conf</screen>
-
-      <screen>&prompt.root; fgrep -n 8080 server.xml</screen>
-
-      <screen>~65:         By default, a non-SSL HTTP/1.1 Connector is established on port 8080.</screen>
-
-      <screen>~89:         port="8080" minProcessors="5" maxProcessors="75"</screen>
-
-      <screen>&prompt.root; cat server.xml | sed s/8080/80/ > server.xml</screen>
+      <screen>&prompt.root; cd /usr/local/tomcat-4.0/conf
+&prompt.root; fgrep -n 8080 server.xml
+~65:         By default, a non-SSL HTTP/1.1 Connector is established on port 8080.
+~89:         port="8080" minProcessors="5" maxProcessors="75"
+&prompt.root; cat server.xml | sed s/8080/80/ > server.xml</screen>
     </sect2>
   </sect1>