merge -r 953209 from 1.3.x branch (MRM-1373)

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

diff --git a/archiva-docs/src/site/apt/adminguide/databases.apt b/archiva-docs/src/site/apt/adminguide/databases.apt
index cd56a98fd55bb9e8d7b20874254465c4d68c9dbf..149df5168ecff8f86f6bdbbaf2132784f7049509 100644 (file)
--- a/archiva-docs/src/site/apt/adminguide/databases.apt
+++ b/archiva-docs/src/site/apt/adminguide/databases.apt
@@ -32,6 +32,9 @@ Apache Archiva Databases
   By default the archiva and users databases are stored in the <<<databases>>> directory where Archiva is installed. To change the
   path, just edit all instances of the "DatabaseName" property in <<<conf/jetty.xml>>> (see below). 
 
+  <<Note:>> If you are using MySQL as your database, Archiva fails when the users database created is initially set to UTF-8 for the character encoding. 
+  As a workaround, set the database to UTF-8 encoding after it has been populated. See {{{http://jira.codehaus.org/browse/MRM-1373} MRM-1373}} for more details.
+
 +------+
 ...
 <New id="archiva" class="org.mortbay.jetty.plus.naming.Resource">