From: Brett Porter <brett@apache.org>
Date: Fri, 28 Mar 2008 15:36:50 +0000 (+0000)
Subject: [MRM-656] documentation adjustments
X-Git-Tag: archiva-r676265~246
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fremotes%2Ftrunk%40642424;p=archiva.git

[MRM-656] documentation adjustments
Merged from: r642263


git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@642266 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-docs/src/site/apt/adminguide/webapp.apt b/archiva-docs/src/site/apt/adminguide/webapp.apt
index d34cdfe6c..782513a83 100644
--- a/archiva-docs/src/site/apt/adminguide/webapp.apt
+++ b/archiva-docs/src/site/apt/adminguide/webapp.apt
@@ -45,11 +45,11 @@ To deploy Archiva on Tomcat 5.5 and Tomcat 6.0
  </Context>
 +-------------------------------------------------------------------------+
 
-   * Install <<<derby-10.1.3.1.jar>>> and <<<mail-1.4.jar>>> into the Tomcat <<<common/lib>>>. This is required since the data sources are
-     instantiated before the web application.
+   * Install <<<derby-10.1.3.1.jar>>> (or later) and <<<mail-1.4.jar>>> into the Tomcat 5.5 <<<common/lib>>> or Tomcat 6.0 <<<lib>>> directory.
+     This is required since the data sources are instantiated before the web application.
 
    <<Note>>: Tomcat 5.5.20 and 5.5.23 are missing MailSessionFactory and a
-   few other classes.  JNDI mail sessions will <not> work.  Use Tomcat 5.5.17
+   few other classes.  JNDI mail sessions will <not> work.  Use Tomcat 5.5.25
    instead, or see {{{http://issues.apache.org/bugzilla/show_bug.cgi?id=40668}
    Bug 40668}} for a workaround.