Improve instructions for separating the installation and configuration. Other minor...

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

diff --git a/archiva-docs/src/site/apt/adminguide/standalone.apt b/archiva-docs/src/site/apt/adminguide/standalone.apt
index 5e1d8ed707c1fcf3ffb68a9638398bab915c55d8..0c87b30910dd5384b01b237fdd154cf6fff624b0 100644 (file)
--- a/archiva-docs/src/site/apt/adminguide/standalone.apt
+++ b/archiva-docs/src/site/apt/adminguide/standalone.apt
@@ -41,22 +41,24 @@ Installing Standalone Distribution of Apache Archiva
 
 * Separating the base from the installation
 
-  The standalone instance of Archiva uses the Plexus application server, which is capable of separating it's configuration from installation,
-  in much the same way Tomcat does for example.
+  The standalone installation of Archiva is capable of separating its configuration from installation
+  in much the same way Tomcat does.
 
   This is achieved by the following steps:
 
-   [[1]] Creating the base location. For example, you might install Archiva in <<</opt/archiva-1.0>>> and the data in <<</var/archiva>>>. Create the directories <<</var/archiva/logs>>>, <<</var/archiva/data>>> and <<</var/archiva/conf>>>.
+   [[1]] Create the base location. For example, you might install Archiva in <<</opt/archiva-1.4>>> and the data in <<</var/archiva>>>. Create the directories <<</var/archiva/logs>>>, <<</var/archiva/data>>> and <<</var/archiva/conf>>>.
 
-   [[2]] Copy the configuration files from the Archiva installation (eg <<</opt/archiva-1.0/conf>>> to the new location (eg. <<</var/archiva/conf>>>). If you've previously run Archiva, you may need to edit <<<conf/archiva.xml>>> to change the location of the repositories
+   [[2]] Move the configuration files from the Archiva installation (e.g. <<</opt/archiva-1.4/conf>>> to the new location (e.g. <<</var/archiva/conf>>>). If you've previously run Archiva, you may need to edit <<<conf/archiva.xml>>> to change the location of the repositories.
 
-   [[3]] Set the environment variable <<<ARCHIVA_BASE>>> to the data location (eg. <<</var/archiva>>>). In bash, be sure to export the variable.
+   [[3]] (Optionally, leave a README file in the old conf location as a reminder of where you moved the config files.)
 
-   [[4]] Start Archiva standalone as described above from the installation location
+   [[4]] Set the environment variable <<<ARCHIVA_BASE>>> to the new location (e.g. <<</var/archiva>>>). In bash, be sure to export the variable.
+
+   [[5]] Start Archiva standalone as described above from the installation location
 
 * Configuring Archiva
 
-  Archiva's configuration is loaded from the following files, in order of most precedent:
+  Archiva's configuration is loaded from the following files, in order of precedence:
 
     * <<<~/.m2/archiva.xml>>>
 
@@ -64,7 +66,7 @@ Installing Standalone Distribution of Apache Archiva
 
     * <<<conf/archiva.xml>>> in the Archiva installation
 
-  When Archiva saves it's configuration, all configuration is stored to a single file. The file chosen is by the following rules:
+  When Archiva saves its configuration, all configuration is stored in a single file. The file chosen is by the following rules:
 
     * If <<<~/.m2/archiva.xml>>> exists, it is saved there