summaryrefslogtreecommitdiffstats
path: root/archiva-docs/src
diff options
context:
space:
mode:
authorMaria Odea B. Ching <oching@apache.org>2010-01-12 03:49:33 +0000
committerMaria Odea B. Ching <oching@apache.org>2010-01-12 03:49:33 +0000
commit098b24d0a7d22facb9ae2455a54b06d3a0472040 (patch)
tree92a69014766fccf4d59971de998d63b2199e65b3 /archiva-docs/src
parentb44ad982c3afa5a3f34c4fd682eea9b2925e7898 (diff)
downloadarchiva-098b24d0a7d22facb9ae2455a54b06d3a0472040.tar.gz
archiva-098b24d0a7d22facb9ae2455a54b06d3a0472040.zip
[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
Diffstat (limited to 'archiva-docs/src')
-rw-r--r--archiva-docs/src/site/apt/adminguide/webapp.apt3
1 files changed, 2 insertions, 1 deletions
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 <<<\<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"?>