From: Maria Odea B. Ching Date: Tue, 12 Jan 2010 03:49:33 +0000 (+0000) Subject: [MRM-1305] Documentation for setting up archiva with tomcat 6 specifies invalid archi... X-Git-Tag: archiva-1.3~12 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=098b24d0a7d22facb9ae2455a54b06d3a0472040;p=archiva.git [MRM-1305] Documentation for setting up archiva with tomcat 6 specifies invalid archiva.xml o add note to remove xml encoding in config file when using tomcat 6 git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@898174 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 4cea4008a..1e9c6dbe2 100644 --- a/archiva-docs/src/site/apt/adminguide/webapp.apt +++ b/archiva-docs/src/site/apt/adminguide/webapp.apt @@ -20,7 +20,8 @@ To deploy Archiva on Tomcat 5.5 and Tomcat 6.0 * Copy the war file into the new directory - * Create a <<<\/conf/Catalina/localhost/archiva.xml>>> file with the following data (replace the database paths with a suitable location): + * Create a <<<\/conf/Catalina/localhost/archiva.xml>>> file with the following data (replace the database paths with a suitable location). When using + Tomcat 6.0+, do not include the first line (XML encoding) in the <<>> configuration specified below to avoid parsing errors during startup: +-------------------------------------------------------------------------+