Return-Path: Delivered-To: apmail-archiva-commits-archive@www.apache.org Received: (qmail 70837 invoked from network); 25 Oct 2008 06:19:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 Oct 2008 06:19:51 -0000 Received: (qmail 57566 invoked by uid 500); 25 Oct 2008 06:19:54 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 57530 invoked by uid 500); 25 Oct 2008 06:19:54 -0000 Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list commits@archiva.apache.org Received: (qmail 57521 invoked by uid 99); 25 Oct 2008 06:19:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Oct 2008 23:19:54 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 25 Oct 2008 06:18:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 470C323888EB; Fri, 24 Oct 2008 23:19:00 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r707817 - /archiva/trunk/archiva-docs/src/site/apt/adminguide/standalone.apt Date: Sat, 25 Oct 2008 06:19:00 -0000 To: commits@archiva.apache.org From: brett@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081025061900.470C323888EB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Fri Oct 24 23:18:59 2008 New Revision: 707817 URL: http://svn.apache.org/viewvc?rev=707817&view=rev Log: [MRM-986] correct documentation in accordance with current behaviour Modified: archiva/trunk/archiva-docs/src/site/apt/adminguide/standalone.apt Modified: archiva/trunk/archiva-docs/src/site/apt/adminguide/standalone.apt URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-docs/src/site/apt/adminguide/standalone.apt?rev=707817&r1=707816&r2=707817&view=diff ============================================================================== --- archiva/trunk/archiva-docs/src/site/apt/adminguide/standalone.apt (original) +++ archiva/trunk/archiva-docs/src/site/apt/adminguide/standalone.apt Fri Oct 24 23:18:59 2008 @@ -68,7 +68,9 @@ * If <<<~/.m2/archiva.xml>>> exists, it is saved there - * Otherwise, it is saved to <<<$ARCHIVA_BASE/conf/archiva.xml>>>, regardless of whether it previously existed. + * Otherwise, if <<<$ARCHIVA_BASE/conf/archiva.xml>>> exists, it is saved there + + * If neither apply, it is saved to <<<~/.m2/archiva.xml>>>. The configuration will never be saved in the Archiva installation directory if you are using a separate base directory.