Index: jetspeed-2.2/src/site/xdoc/getting-started.xml
===================================================================
--- jetspeed-2.2/src/site/xdoc/getting-started.xml	(revision 772715)
+++ jetspeed-2.2/src/site/xdoc/getting-started.xml	(working copy)
@@ -114,7 +114,7 @@
 		<li>
 			Servlet 2.4 (or higher) Engine:
 				<ul>
-						<li><a href="deployguide/guide-tomcat.html">Tomcat 6 or Tomcat 5.5.x</a></li> 
+						<li><a href="deployguide/guide-tomcat.html">Tomcat 6.0.18+ or Tomcat 5.5.27+</a></li> 
 						<li>Jetty</li>
 						<li><a href="deployguide/deploying-jetspeed-to-websphere.html">Websphere 6.0</a></li>
 						<li>Geronimo</li>
Index: jetspeed-2.2/jetspeed-guide-deploy/src/site/site.xml
===================================================================
--- jetspeed-2.2/jetspeed-guide-deploy/src/site/site.xml	(revision 772715)
+++ jetspeed-2.2/jetspeed-guide-deploy/src/site/site.xml	(working copy)
@@ -48,7 +48,7 @@
             <item name="Overview" href="index.html" />            
         </menu>
     	<menu name="Deployment">
-    		<item name="Tomcat 5" href="guide-tomcat.html"/>
+    		<item name="Tomcat" href="guide-tomcat.html"/>
     		<item name="Websphere" href="deploying-jetspeed-to-websphere.html"/>
     		<item name="Deploy Tools" href="deploy-tools.html" />
     	</menu>     
Index: jetspeed-2.2/jetspeed-guide-deploy/src/site/xdoc/guide-tomcat.xml
===================================================================
--- jetspeed-2.2/jetspeed-guide-deploy/src/site/xdoc/guide-tomcat.xml	(revision 772715)
+++ jetspeed-2.2/jetspeed-guide-deploy/src/site/xdoc/guide-tomcat.xml	(working copy)
@@ -17,7 +17,7 @@
 -->
 <document>
 	<properties>
-		<title>How to Download Jetspeed-2</title>
+	    <title>Apache Tomcat Overview</title>
 		<subtitle>Documentation on How to Download Jetspeed-2</subtitle>
 		<authors>
 			<person name="David Le Strat" email="dlestrat@apache.org" />
@@ -38,8 +38,8 @@
 Jetspeed is well tested and integrated to run on the following Apache Tomcat platforms:
 </p>
 <ul>
-<li>All Tomcat 6.x version - recommended for Servlet API 2.5 / JSP 2.1</li>
-<li>All Tomcat 5.5.x versions - recommended for Servlet API 2.4 / JSP 2.0</li>
+<li>Tomcat 6.0.18+ - recommended for Servlet API 2.5 / JSP 2.1</li>
+<li>Tomcat 5.5.27+ - recommended for Servlet API 2.4 / JSP 2.0</li>
 </ul>
 </subsection>
 <subsection name="How Jetspeed runs in Tomcat">
@@ -336,7 +336,10 @@
          debug="0"/>
 ]]>
 </source>
-<p>NOTE: For Tomcat version 5.5.24 and above, set <i>useContextClassLoader="true"</i>. For versions 5.5.23 and earlier, set <i>useContextClassLoader="false"</i></p>
+<p>
+  NOTE: Jetspeed 2.2 only supports Tomcat 5.5.27 or newer, however if for some reason you have to use Tomcat version 5.5.23 or earlier,
+  set <i>useContextClassLoader="false"</i>.
+</p>
 </subsection>
 <subsection name="Tomcat on Windows">
 				<p>
Index: jetspeed-2.2/jetspeed-guide-build/src/site/xdoc/maven-2-build.xml
===================================================================
--- jetspeed-2.2/jetspeed-guide-build/src/site/xdoc/maven-2-build.xml	(revision 772715)
+++ jetspeed-2.2/jetspeed-guide-build/src/site/xdoc/maven-2-build.xml	(working copy)
@@ -35,7 +35,7 @@
                     <ul>
                         <li>Java Development Kit 1.5</li>
                         <li><a class="externalLink" href="http://maven.apache.org/">Apache Maven</a> 2.0.9 or higher</li>
-                        <li><a class="externalLink" href="http://tomcat.apache.org/">Apache Tomcat</a> 5.5.26 or higher</li>
+                        <li><a class="externalLink" href="http://tomcat.apache.org/">Apache Tomcat</a> 5.5.27 or higher, or 6.0.18 or higher</li>
                         <li>
                             With a SVN client tool, you can checkout the sources from here:
                             <a href='http://svn.apache.org/repos/asf/portals/jetspeed-2/portal/trunk/' target='_blank'>http://svn.apache.org/repos/asf/portals/jetspeed-2/portal/trunk/</a>
@@ -60,8 +60,9 @@
                     <div class="source"><pre>&lt;properties&gt;
     ...
     &lt;!-- Your Tomcat Installation Path --&gt;
-    &lt;org.apache.jetspeed.server.home>/home/demo/tomcat-5.5&lt;/org.apache.jetspeed.server.home&gt;
-
+    &lt;org.apache.jetspeed.server.home>/home/demo/tomcat-6&lt;/org.apache.jetspeed.server.home&gt;
+    &lt;org.apache.jetspeed.catalina.version.major&gt;6&lt;/org.apache.jetspeed.catalina.version.major&gt;
+                        
     &lt;!-- Production jdbc driver artifact properties --&gt;
     &lt;org.apache.jetspeed.production.jdbc.driver.groupId&gt;org.apache.derby&lt;/org.apache.jetspeed.production.jdbc.driver.groupId&gt;
     &lt;org.apache.jetspeed.production.jdbc.driver.artifactId&gt;derby&lt;/org.apache.jetspeed.production.jdbc.driver.artifactId&gt;
@@ -98,8 +99,9 @@
                     <div class="source"><pre>&lt;properties&gt;
     ...
     &lt;!-- Your Tomcat Installation Path --&gt;
-    &lt;org.apache.jetspeed.server.home>/home/demo/tomcat-5.5&lt;/org.apache.jetspeed.server.home&gt;
-
+    &lt;org.apache.jetspeed.server.home>/home/demo/tomcat-6&lt;/org.apache.jetspeed.server.home&gt;
+    &lt;org.apache.jetspeed.catalina.version.major&gt;6&lt;/org.apache.jetspeed.catalina.version.major&gt;
+    
     &lt;!-- Production jdbc driver artifact properties --&gt;
     &lt;org.apache.jetspeed.production.jdbc.driver.groupId&gt;mysql&lt;/org.apache.jetspeed.production.jdbc.driver.groupId&gt;
     &lt;org.apache.jetspeed.production.jdbc.driver.artifactId&gt;mysql-connector-java&lt;/org.apache.jetspeed.production.jdbc.driver.artifactId&gt;
Index: jetspeed-2.2/jetspeed-guide-build/src/site/xdoc/jetspeed-archetype.xml
===================================================================
--- jetspeed-2.2/jetspeed-guide-build/src/site/xdoc/jetspeed-archetype.xml	(revision 772715)
+++ jetspeed-2.2/jetspeed-guide-build/src/site/xdoc/jetspeed-archetype.xml	(working copy)
@@ -37,7 +37,7 @@
           <ul>
               <li>Java Development Kit 1.5</li>
               <li><a class="externalLink" href="http://maven.apache.org/">Apache Maven</a> 2.0.9 or higher</li>
-              <li><a class="externalLink" href="http://tomcat.apache.org/">Apache Tomcat</a> 5.5.26 or higher</li>
+              <li><a class="externalLink" href="http://tomcat.apache.org/">Apache Tomcat</a> 5.5.27 or higher, or 6.0.18 or higher</li>
           </ul>
       </p>
       <subsection name="Optional: Building and Installing Jetspeed-2 Maven Plugins">
@@ -140,6 +140,10 @@
                 <td>The Tomcat server directory which is the target of the custom portal deployment.</td>
               </tr>
               <tr>
+                <td>org.apache.jetspeed.catalina.version.major</td>
+                <td>The major version number of Tomcat. Supported values are 5 and 6. Default value is 6.</td>
+              </tr>
+              <tr>
                 <td>org.apache.jetspeed.production.jdbc.driver.groupId</td>
                 <td>The groupdId of your JDBC driver. For example, this can be "org.apache.derby" for Apache Derby JDBC driver.</td>
               </tr>
@@ -186,7 +190,8 @@
       ...
       
       <properties>
-        <org.apache.jetspeed.server.home>/change/this/apache-tomcat-5.5.26/</org.apache.jetspeed.server.home>
+        <org.apache.jetspeed.server.home>/change/this/apache-tomcat-6.0.18/</org.apache.jetspeed.server.home>
+        <org.apache.jetspeed.catalina.version.major>6</org.apache.jetspeed.catalina.version.major>
         <org.apache.jetspeed.production.jdbc.driver.groupId>org.apache.derby</org.apache.jetspeed.production.jdbc.driver.groupId>
         <org.apache.jetspeed.production.jdbc.driver.artifactId>derby</org.apache.jetspeed.production.jdbc.driver.artifactId>
         <org.apache.jetspeed.production.jdbc.driver.version>10.3.2.1</org.apache.jetspeed.production.jdbc.driver.version>
@@ -210,7 +215,8 @@
       ...
       
       <properties>
-        <org.apache.jetspeed.server.home>C:/apache-tomcat-5.5.26/</org.apache.jetspeed.server.home>
+        <org.apache.jetspeed.server.home>C:/apache-tomcat-6.0.18/</org.apache.jetspeed.server.home>
+        <org.apache.jetspeed.catalina.version.major>6</org.apache.jetspeed.catalina.version.major>
         <org.apache.jetspeed.production.jdbc.driver.groupId>mysql</org.apache.jetspeed.production.jdbc.driver.groupId>
         <org.apache.jetspeed.production.jdbc.driver.artifactId>mysql-connector-java</org.apache.jetspeed.production.jdbc.driver.artifactId>
         <org.apache.jetspeed.production.jdbc.driver.version>5.1.6</org.apache.jetspeed.production.jdbc.driver.version>