svn commit: r898174 - /archiva/trunk/archiva-docs/src/site/apt/adminguide/webapp.apt

[oc...@apache.org]

Author: oching
Date: Tue Jan 12 03:49:33 2010
New Revision: 898174

URL: http://svn.apache.org/viewvc?rev=898174&view=rev
Log:
[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

Modified:
    archiva/trunk/archiva-docs/src/site/apt/adminguide/webapp.apt

Modified: archiva/trunk/archiva-docs/src/site/apt/adminguide/webapp.apt
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-docs/src/site/apt/adminguide/webapp.apt?rev=898174&r1=898173&r2=898174&view=diff
==============================================================================
--- archiva/trunk/archiva-docs/src/site/apt/adminguide/webapp.apt (original)
+++ archiva/trunk/archiva-docs/src/site/apt/adminguide/webapp.apt Tue Jan 12 03:49:33 2010
@@ -20,7 +20,8 @@
 
    * Copy the war file into the new directory
 
-   * Create a <<<\<tomcat home\>/conf/Catalina/localhost/archiva.xml>>> file with the following data (replace the database paths with a suitable location):
+   * Create a <<<\<tomcat home\>/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 <<<archiva.xml>>> configuration specified below to avoid parsing errors during startup: 
 
 +-------------------------------------------------------------------------+
  <?xml version="1.0" encoding="UTF-8"?>