remove bogus environment variables in favour of descriptions

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

diff --git a/archiva-docs/src/site/apt/adminguide/customising-security.apt b/archiva-docs/src/site/apt/adminguide/customising-security.apt
index 2df1884150e492916f0277587ba652e1fe0d79be..ffc7ed41e3487a44f45aa624d468acc873366dbc 100644 (file)
--- a/archiva-docs/src/site/apt/adminguide/customising-security.apt
+++ b/archiva-docs/src/site/apt/adminguide/customising-security.apt
@@ -9,13 +9,12 @@ Archiva Security Configuration
 
    * <<<~/.m2/security.properties>>>
   
-   * <<<$ARCHIVA_HOME/conf/security.properties>>>
+   * <<<conf/security.properties>>> in the Archiva installation
 
    []
 
  (In the above list, <<<~>>> is the home directory of the user who is running
- Archiva, and <<<$ARCHIVA_HOME>>> is the directory where Archiva is installed,
- such as <<</opt/archiva-1.1-SNAPSHOT>>>.)
+ Archiva.)
 
 ~~TODO: Link to plexus-redback documentation when available
 
@@ -47,5 +46,5 @@ security.policy.password.rule.nowhitespace.enabled=true
  
  <<Note:>> If installed standalone, Archiva's list of configuration files is <itself> configurable, and
  can be found in:
- <<<$ARCHIVA_HOME/apps/archiva/webapp/WEB-INF/classes/META-INF/plexus/application.xml>>>
+ <<<apps/archiva/WEB-INF/classes/META-INF/plexus/application.xml>>>
 

diff --git a/archiva-docs/src/site/apt/adminguide/standalone.apt b/archiva-docs/src/site/apt/adminguide/standalone.apt
index 31ed6a04e567198faaddf096c9e70185c5a2dc55..2676b190dd4968235a48971d0750a282eede50e8 100644 (file)
--- a/archiva-docs/src/site/apt/adminguide/standalone.apt
+++ b/archiva-docs/src/site/apt/adminguide/standalone.apt
@@ -48,9 +48,9 @@ Installing Standalone Distribution of Apache Archiva
 
     * 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, it is saved to <<<$APP_BASE/conf/archiva.xml>>>, regardless of whether it previously existed.
 
-  The configuration will never be saved in <<<$ARCHIVA_HOME>>>.
+  The configuration will never be saved in the Archiva installation directory if you are using a separate base directory.
 
   Note that the configuration can be edited, but only when Archiva is not running as it will not reload a changed configuration file, and will save over it
   if something is changed in the web interface.
@@ -61,9 +61,9 @@ Installing Standalone Distribution of Apache Archiva
  to store the user information. It can be configured to use an external database
  by providing a JDBC driver and editing the <<<jetty.xml>>> file.
 
- [[1]] Place the jar containing the JDBC driver in <<<$ARCHIVA_HOME/lib>>>.
+ [[1]] Place the jar containing the JDBC driver in the <<<lib>>> directory of the Archiva installation.
 
- [[2]] Edit <<<$ARCHIVA_HOME/conf/jetty.xml>>>, providing the JDBC driver class
+ [[2]] Edit <<<conf/jetty.xml>>>, providing the JDBC driver class
  name, database url, username, and password.
 
  []