Attachment 35238 Details for Bug 56936 – article.sgml.diff

[patch] article.sgml.diff

article.sgml.diff (text/plain), 7.89 KB, created by Josef El-Rayes on 2003-09-16 23:50:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef El-Rayes

Created: 2003-09-16 23:50:00 UTC

Size: 7.89 KB

patch

obsolete

>--- article.sgml.orig	Wed Sep 17 00:30:07 2003
>+++ article.sgml	Wed Sep 17 00:41:55 2003
>@@ -35,7 +35,8 @@
> 
> <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
> <!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
>-
>+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
>+%freebsd;
> <!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
> %trademarks;
> 
>@@ -99,8 +100,8 @@
> 	least amount of aggravation.  Plan on spending a whole day on such
> 	a project as it will take time to assemble all the pieces and
> 	compile them individually, and then as a whole.  It also shows how
>-	to install the famous Jakarta Tomcat Servlet and &jsp; container on
>-	the FreeBSD operating system.</para>
>+	to install the famous <application>Jakarta Tomcat Servlet and &jsp; container</application> on 
>+	the &os; operating system.</para> 
>     </abstract>
>   </articleinfo>
>   
>@@ -127,7 +128,7 @@
>       <filename role="package">www/apache13</filename> on my FreeBSD
>       system.</para>
> 
>-    <para>The Tomcat portion of the install is very straight forward, but
>+    <para>The <application>Tomcat</application> portion of the install is very straight forward, but
>       the difficulty I had was getting &java; Development Kit up and
>       running for FreeBSD 4.X, as Sun Microsystems only supplies
>       Binaries for Linux, &solaris;, and &windowsnt;.  This means that I
>@@ -139,8 +140,8 @@
> 
>     <para>In this article, you will find how to install the &java;
>       Development Kit for FreeBSD, and how to get up and running with
>-      Tomcat.  A <xref linkend="ref"> section is also provided for
>-      further reading.</para>	
>+      <application>Tomcat</application>. A <xref linkend="ref"> section is also provided for 
>+      further reading.</para> 
>   </sect1>
> 
>   <sect1>
>@@ -383,24 +384,24 @@
>       <para><application>Tomcat</application> is an open-source
> 	implementation of the &java; Servlets and &javaserver.pages;
> 	technologies, developed under the Jakarta project at the Apache
>-	Software Foundation.  Tomcat implements a new Servlet framework
>+	Software Foundation.  <application>Tomcat</application> implements a new Servlet framework
> 	(called Catalina) that is based on completely new architecture
> 	with the Servlet 2.3 and <acronym>&jsp;</acronym> 1.2
> 	specifications.  It includes many additional features that make
> 	it a useful platform for developing and deploying web
>-	applications and web services.  In a nutshell, Tomcat is an
>+	applications and web services.  In a nutshell, <application>Tomcat</application> is an
> 	application server written in 100% Pure &java;.</para>
> 
>-      <para>Tomcat is used for many purposes, and is not limited to
>+      <para><application>Tomcat</application> is used for many purposes, and is not limited to
> 	Application Servers.  It provides an open platform to develop
>-	extensible web and content management services.  When Tomcat is
>+	extensible web and content management services.  When <application>Tomcat</application> is
> 	used with an optimized FreeBSD system, it can provide highly
> 	reliable and fast pacing services.</para>
> 
>       <para>Please refer to the <xref linkend="ref"> section for more
>-	information on Tomcat and <acronym>&jsp;</acronym>.  The next
>+	information on <application>Tomcat</application> and <acronym>&jsp;</acronym>.  The next
> 	section will demonstrate how to build the <quote>Tomcat
>-	Environment</quote> for FreeBSD.  The version of Tomcat used in
>+	Environment</quote> for &os;.  The version of <application>Tomcat</application> used in
> 	this guide is <literal>4.0.3</literal>.  This version contains
> 	major bug fixes, and the following updates/changes:</para>
> 
>@@ -423,11 +424,11 @@
>     <sect2>
>       <title>The Tomcat environment for FreeBSD</title>
> 
>-      <para>It is very simple to install Tomcat on a FreeBSD machine,
>+      <para>It is very simple to install <application>Tomcat</application> on a &os; machine,
> 	after setting up the necessary &java; environment, which we have
> 	previously completed.</para>
> 
>-      <para>In-order to setup Tomcat on FreeBSD, follow the below 
>+      <para>In-order to setup <application>Tomcat</application> on &os;, follow the below 
>         procedure:</para>
> 
>       <procedure>
>@@ -454,11 +455,11 @@
> 	    adding it into either <filename>.profile</filename> or
> 	    <filename>.cshrc</filename>, depending on the shell you are
> 	    using. This variable is very crucial for the functioning of
>-	    all the &java; based programs, including Tomcat itself.</para>
>+	    all the &java; based programs, including <application>Tomcat</application> itself.</para>
> 	</step>
> 
> 	<step>
>-	  <para>Download the Tomcat <quote>binary distribution</quote>
>+	  <para>Download the <application>Tomcat</application> <quote>binary distribution</quote>
> 	    from the Jakarta website, which is located at
> 	    <literal><ulink url="&tomcat403"></ulink></literal>.  The
> 	    file to download is called
>@@ -499,7 +500,7 @@
> 	<para><literal>Installation by using the source code is currently
> 	  out of scope for this document.  Please refer to the following
> 	  files for addition information on building from source,
>-	  available from your Tomcat distribution
>+	  available from your <application>Tomcat</application> distribution
> 	  directory:</literal></para>
> 
> 	<itemizedlist>
>@@ -517,26 +518,26 @@
>     <sect2>
>       <title>Operating Tomcat - Basics</title>
> 
>-      <para>Now that we have finished installing Tomcat.  The following
>-	example shows how to start the Tomcat server:</para>
>+<para>Now that we have finished installing <application>Tomcat</application>.  The following
>+example shows how to start the <application>Tomcat</application> server:</para>
> 
>       <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
>+      <para>You can test if your <application>Tomcat</application> 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>
>+	<application>Tomcat</application>:</para>
> 
>       <screen>&prompt.root; cd /usr/local/tomcat-4.0/bin
> &prompt.root; ./shutdown.sh</screen>
> 
>-      <para>(for stopping Tomcat)</para>
>+      <para>(for stopping <application>Tomcat</application>)</para>
> 
>       <para>The <filename>startup.sh</filename> and
> 	<filename>shutdown.sh</filename> are frontends to the
> 	<filename>catalina.sh</filename> executable script in the same
>-	directory; if you would like to start Tomcat automatically at
>+	directory; if you would like to start <application>Tomcat</application> automatically at
> 	boot-time run:</para>
> 
>       <screen>&prompt.root; cd /usr/local/etc/rc.d
>@@ -550,7 +551,7 @@
> 
>       <para>If your port <literal>8080</literal> is occupied by some other
> 	service, you can change it by editing the
>-	<filename>server.xml</filename> in your Tomcat's
>+	<filename>server.xml</filename> in your <application>Tomcat's</application>
> 	<filename>conf/</filename> directory.  In the example below, the
> 	port will be changed to 80, assuming there is no service running
> 	on that port.</para>
>@@ -617,9 +618,9 @@
>       <title>Conclusion</title>
> 
>       <para>Finally, we are at the end of the article and have a working
>-	version of Tomcat.  We hope that you have learned the basics of
>+	version of <application>Tomcat</application>.  We hope that you have learned the basics of
> 	installing and building the &java; Development Kit on FreeBSD,
>-	along with installation of the Tomcat binary distribution
>+	along with installation of the <application>Tomcat</application> binary distribution
> 	application server released by the Apache Software Foundation.
> 	The <xref linkend="ref"> section contains pointers to additional
> 	resources on this topic, some which are in print, some which are

Actions: View | Diff

Attachments on bug 56936: 35238