fix some ambiguous links

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

18 files changed, 46 insertions, 46 deletions

diff --git a/archiva-docs/src/site/apt/adminguide/configuration-files.apt b/archiva-docs/src/site/apt/adminguide/configuration-files.apt
index b6da527ef..ef34b8484 100644
--- a/archiva-docs/src/site/apt/adminguide/configuration-files.apt
+++ b/archiva-docs/src/site/apt/adminguide/configuration-files.apt
@@ -11,7 +11,7 @@ Configuration Files of Apache Archiva
 
     * <<<archiva.xml>>> - this is the primary Archiva configuration file
 
-    * <<<security.properties>>> - this configures the security as described in the {{{security.html} security configuration documentation}}
+    * <<<security.properties>>> - this configures the security as described in the {{{./security.html} security configuration documentation}}
 
   This section will focus on the <<<archiva.xml>>> file.
 
@@ -19,7 +19,7 @@ Configuration Files of Apache Archiva
 
   The Archiva configuration file is stored in one of two locations:
 
-    * The application server configuration directory (see {{{standalone.html} installing Archiva standalone}} for more information)
+    * The application server configuration directory (see {{{./standalone.html} installing Archiva standalone}} for more information)
 
     * The user home directory (<<<~/.m2/archiva.xml>>>). 
 
diff --git a/archiva-docs/src/site/apt/adminguide/configuration.apt b/archiva-docs/src/site/apt/adminguide/configuration.apt
index 11e5192db..8b080fb47 100644
--- a/archiva-docs/src/site/apt/adminguide/configuration.apt
+++ b/archiva-docs/src/site/apt/adminguide/configuration.apt
@@ -8,17 +8,17 @@ Runtime Configuration of Apache Archiva
 
   The following describe the various sections of the administration menu:
 
-    * {{{repositories.html} Configuring repositories}}
+    * {{{./repositories.html} Configuring repositories}}
 
-    * {{{proxy-connectors.html} Configuring proxy connectors}}
+    * {{{./proxy-connectors.html} Configuring proxy connectors}}
 
-    * {{{network-proxies.html} Configuring network proxies}}
+    * {{{./network-proxies.html} Configuring network proxies}}
 
-    * {{{legacy.html} Configuring legacy (maven 1) support}}
+    * {{{./legacy.html} Configuring legacy (maven 1) support}}
 
-    * {{{consumers.html} Configuring repository scanning and consumers}}
+    * {{{./consumers.html} Configuring repository scanning and consumers}}
 
-    * {{{staging-repositories.html} Staging and merging repositories}}
+    * {{{./staging-repositories.html} Staging and merging repositories}}
 
     []
 
diff --git a/archiva-docs/src/site/apt/adminguide/databases.apt b/archiva-docs/src/site/apt/adminguide/databases.apt
index 149df5168..8bfa35056 100644
--- a/archiva-docs/src/site/apt/adminguide/databases.apt
+++ b/archiva-docs/src/site/apt/adminguide/databases.apt
@@ -26,7 +26,7 @@ Apache Archiva Databases
     * <<<jdbc/users>>> - the user store
 
   Configuring an external database for either or both of these sources depends is configured in <<<jetty.xml>>> if you are using the
-  {{{standalone.html} standalone installation}}, or in the application server configuration if you are using the {{{webapp.html} web application
+  {{{./standalone.html} standalone installation}}, or in the application server configuration if you are using the {{{./webapp.html} web application
   installation}}.
 
   By default the archiva and users databases are stored in the <<<databases>>> directory where Archiva is installed. To change the
diff --git a/archiva-docs/src/site/apt/adminguide/index.apt b/archiva-docs/src/site/apt/adminguide/index.apt
index 11b2d6a6a..723583d8d 100644
--- a/archiva-docs/src/site/apt/adminguide/index.apt
+++ b/archiva-docs/src/site/apt/adminguide/index.apt
@@ -9,21 +9,21 @@ System Administrators Guide to Apache Archiva
 
   The following sections describe the process for configuring Archiva for use:
 
-    * {{{installing.html} Installing Archiva}}
+    * {{{./installing.html} Installing Archiva}}
 
-    * {{{databases.html} Configuring databases for Archiva}}
+    * {{{./databases.html} Configuring databases for Archiva}}
 
-    * {{{security.html} Configuring security for Archiva}}
+    * {{{./security.html} Configuring security for Archiva}}
 
-    * {{{configuration.html} Using the graphical administration interface}}
+    * {{{./configuration.html} Using the graphical administration interface}}
 
-    * {{{configuration-files.html} The configuration files available for Archiva}}
+    * {{{./configuration-files.html} The configuration files available for Archiva}}
 
-    * {{{audit-logs.html} Audit logging}}
+    * {{{./audit-logs.html} Audit logging}}
 
-    * {{{reports.html} Repository health reports}}
+    * {{{./reports.html} Repository health reports}}
 
-    * {{{web-services.html} Archiva Web Services}}
+    * {{{./web-services.html} Archiva Web Services}}
 
     []
 
diff --git a/archiva-docs/src/site/apt/adminguide/installing.apt b/archiva-docs/src/site/apt/adminguide/installing.apt
index 6f018dbf9..a3ff9ac49 100644
--- a/archiva-docs/src/site/apt/adminguide/installing.apt
+++ b/archiva-docs/src/site/apt/adminguide/installing.apt
@@ -9,9 +9,9 @@ Installing Apache Archiva
 
   The following documents cover the different installation alternatives:
 
-    * {{{standalone.html} Installing standalone}}
+    * {{{./standalone.html} Installing standalone}}
 
-    * {{{webapp.html} Installing as a web application}}
+    * {{{./webapp.html} Installing as a web application}}
 
-    * {{{upgrade.html} Upgrading to a new version}}
+    * {{{./upgrade.html} Upgrading to a new version}}
 
diff --git a/archiva-docs/src/site/apt/adminguide/logging.apt b/archiva-docs/src/site/apt/adminguide/logging.apt
index 8d7ed0ce7..8a8fdc12e 100644
--- a/archiva-docs/src/site/apt/adminguide/logging.apt
+++ b/archiva-docs/src/site/apt/adminguide/logging.apt
@@ -10,15 +10,15 @@ Log Files
   To keep track of the Archiva performance and problems, log files are created during runtime.
   These files can be found in the <<<logs/>>> directory.
   
-  * {{{archiva-logs.html} <<archiva.log>>}} - contains all the start-up information and output logs for Archiva
+  * {{{./archiva-logs.html} <<archiva.log>>}} - contains all the start-up information and output logs for Archiva
   
-  * {{{audit-logs.html} <<archiva-audit.log>>}} - contains information regarding the operations performed against
+  * {{{./audit-logs.html} <<archiva-audit.log>>}} - contains information regarding the operations performed against
                            the repositories and configurations being modified. A good example is when an artifact
                            is deployed to an Archiva repository. The operation will be logged in this file,
                            with the date and timestamp of when the operation occurred, the userId of who performed
                            the deployment, and the artifact that was deployed.
   
-  * {{{security-logs.html} <<archiva-security-audit.log>>}} - contains information regarding Archiva's security.
+  * {{{./security-logs.html} <<archiva-security-audit.log>>}} - contains information regarding Archiva's security.
                             For example, a successful login of a user or a user account is created.
   
   []
diff --git a/archiva-docs/src/site/apt/adminguide/network-proxies.apt b/archiva-docs/src/site/apt/adminguide/network-proxies.apt
index 72ca9b823..2d9ae538e 100644
--- a/archiva-docs/src/site/apt/adminguide/network-proxies.apt
+++ b/archiva-docs/src/site/apt/adminguide/network-proxies.apt
@@ -6,7 +6,7 @@ Understanding Network Proxy Configuration of Apache Archiva
 
   Archiva uses the terminology "proxy" for two different concepts:
 
-    * The remote repository proxying cache, as configured through {{{proxy-connectors.html} proxy connectors}} between repositories
+    * The remote repository proxying cache, as configured through {{{./proxy-connectors.html} proxy connectors}} between repositories
 
     * Network proxies, which are traditional protocol based proxies (primarily for HTTP access to remote repositories over a firewall)
 
diff --git a/archiva-docs/src/site/apt/adminguide/proxy-connectors.apt b/archiva-docs/src/site/apt/adminguide/proxy-connectors.apt
index 5737091be..3ce3c2bcd 100644
--- a/archiva-docs/src/site/apt/adminguide/proxy-connectors.apt
+++ b/archiva-docs/src/site/apt/adminguide/proxy-connectors.apt
@@ -8,7 +8,7 @@ Understanding Proxy Connector Configuration of Apache Archiva
 
     * The remote repository proxying cache, as configured through proxy connectors between repositories
 
-    * {{{network-proxies.html} Network proxies}}, which are traditional protocol based proxies (primarily for HTTP access to remote repositories over a firewall)
+    * {{{./network-proxies.html} Network proxies}}, which are traditional protocol based proxies (primarily for HTTP access to remote repositories over a firewall)
 
     []
 
diff --git a/archiva-docs/src/site/apt/adminguide/repositories.apt b/archiva-docs/src/site/apt/adminguide/repositories.apt
index f4927d6f4..669b3a2eb 100644
--- a/archiva-docs/src/site/apt/adminguide/repositories.apt
+++ b/archiva-docs/src/site/apt/adminguide/repositories.apt
@@ -123,7 +123,7 @@ http://[URL TO ARCHIVA]/repository/[REPOSITORY ID] (e.g. http://localhost:8080/a
 
   For every artifact found by the repository scanner, processing is done on this artifact by different
   consumers. Examples of the processing done are: indexing, repository purge and database update. Details about consumers are 
-  available in the {{{consumers.html} Consumers}} page.
+  available in the {{{./consumers.html} Consumers}} page.
 
 * Repository Purge
 
@@ -204,4 +204,4 @@ Artifacts in the repository:
 
   It is essential that the database scan occur after the repo scan as this is where the pom information of the artifacts in
   the database will be processed by the consumers and in turn, added to the database (as ArchivaProjectModel objects). For
-  more details about the different database consumers, please see the {{{consumers.html} Consumers}} page.
\ No newline at end of file
+  more details about the different database consumers, please see the {{{./consumers.html} Consumers}} page.
\ No newline at end of file
diff --git a/archiva-docs/src/site/apt/adminguide/security.apt b/archiva-docs/src/site/apt/adminguide/security.apt
index 043a22239..c59a4ac00 100644
--- a/archiva-docs/src/site/apt/adminguide/security.apt
+++ b/archiva-docs/src/site/apt/adminguide/security.apt
@@ -7,9 +7,9 @@ Understanding Apache Archiva Security
   Archiva's security is managed by {{{http://redback.codehaus.org/} Redback}}. The following document describes how to configure your
   repository security:
 
-    * {{{roles.html} Roles in Archiva}}
+    * {{{./roles.html} Roles in Archiva}}
 
-    * {{{customising-security.html} Customising Security}}
+    * {{{./customising-security.html} Customising Security}}
 
     []
 
diff --git a/archiva-docs/src/site/apt/adminguide/webapp.apt b/archiva-docs/src/site/apt/adminguide/webapp.apt
index 1e9c6dbe2..f8adbff93 100644
--- a/archiva-docs/src/site/apt/adminguide/webapp.apt
+++ b/archiva-docs/src/site/apt/adminguide/webapp.apt
@@ -102,7 +102,7 @@ Upgrading Archiva
   To upgrade the Archiva web application, simply replace the web application with an alternative. Since the database and configuration files are stored
   externally to the application, no further maintainance is needed.
 
-  For general information about upgrading Archiva, see the relevant section in the {{{standalone.html#Upgrading%20Archiva} Installing standalone}} guide.
+  For general information about upgrading Archiva, see the relevant section in the {{{./standalone.html#Upgrading%20Archiva} Installing standalone}} guide.
 
 Configuring and Running Archiva
 
diff --git a/archiva-docs/src/site/apt/index.apt b/archiva-docs/src/site/apt/index.apt
index f89a0beef..33249c938 100644
--- a/archiva-docs/src/site/apt/index.apt
+++ b/archiva-docs/src/site/apt/index.apt
@@ -14,10 +14,10 @@
 
   To get started with Archiva, you can read the following documentation:
    
-    * {{{quick-start.html} A Quick Getting Started Guide}}
+    * {{{./quick-start.html} A Quick Getting Started Guide}}
 
-    * {{{userguide/index.html} Users Guide}}
+    * {{{./userguide/index.html} Users Guide}}
 
-    * {{{adminguide/index.html} Administrators Guide}}
+    * {{{./adminguide/index.html} Administrators Guide}}
 
     []
diff --git a/archiva-docs/src/site/apt/quick-start.apt b/archiva-docs/src/site/apt/quick-start.apt
index b54b38c3b..4e9b297ab 100644
--- a/archiva-docs/src/site/apt/quick-start.apt
+++ b/archiva-docs/src/site/apt/quick-start.apt
@@ -30,7 +30,7 @@ Installing Archiva
 
   The quickest way to install Archiva is to {{{http://archiva.apache.org/download.html}download}} and use the standalone distribution.
   This includes a bundled Jetty server which can be easily started.
-  For more information on advanced configuration of this instance, refer to the {{{adminguide/standalone.html} Administration Guide}}.
+  For more information on advanced configuration of this instance, refer to the {{{./adminguide/standalone.html} Administration Guide}}.
 
   To get started right away, you can run the following after unpacking:
 
diff --git a/archiva-docs/src/site/apt/release-notes.apt b/archiva-docs/src/site/apt/release-notes.apt
index e0fe6d570..3208a7063 100644
--- a/archiva-docs/src/site/apt/release-notes.apt
+++ b/archiva-docs/src/site/apt/release-notes.apt
@@ -41,7 +41,7 @@ Release Notes for Archiva 1.4
 
 * Release Notes
 
-  The Archiva 1.4 feature set can be seen in the {{{tour/index.html} feature tour}}.
+  The Archiva 1.4 feature set can be seen in the {{{./tour/index.html} feature tour}}.
 
 * Changes in Archiva 1.4
 
diff --git a/archiva-docs/src/site/apt/userguide/index.apt b/archiva-docs/src/site/apt/userguide/index.apt
index 4227e8f46..fa3eb6fa4 100644
--- a/archiva-docs/src/site/apt/userguide/index.apt
+++ b/archiva-docs/src/site/apt/userguide/index.apt
@@ -7,21 +7,21 @@ Users Guide
   Welcome to the Archiva user's guide. Getting to know and use Archiva is very simple - please select one of the following documents to learn how to use
   Archiva quickly.
 
-    * {{{browsing.html} Browsing Archiva repositories}}
+    * {{{./browsing.html} Browsing Archiva repositories}}
 
-    * {{{searching.html} Searching Archiva repositories}}
+    * {{{./searching.html} Searching Archiva repositories}}
 
-    * {{{find-artifact.html} Identifying an unknown artifact by comparing the repository checksum database}}
+    * {{{./find-artifact.html} Identifying an unknown artifact by comparing the repository checksum database}}
 
-    * {{{using-repository.html} Using Archiva as a repository for Maven, Ivy, etc.}}
+    * {{{./using-repository.html} Using Archiva as a repository for Maven, Ivy, etc.}}
 
-    * {{{deploy.html} Deploying artifacts to the repository}}
+    * {{{./deploy.html} Deploying artifacts to the repository}}
 
-    * {{{virtual-repositories.html} Configuring Virtual Repositories}}
+    * {{{./virtual-repositories.html} Configuring Virtual Repositories}}
 
-    * {{{rss.html}RSS Feeds in Archiva}}
+    * {{{./rss.html}RSS Feeds in Archiva}}
     
-    * {{{auditlog-report.html}Viewing the Audit Log Report}}
+    * {{{./auditlog-report.html}Viewing the Audit Log Report}}
 
     []
 
diff --git a/archiva-docs/src/site/xdoc/tour/index.xml b/archiva-docs/src/site/xdoc/tour/index.xml
index d08f65d68..d09d0ca6a 100644
--- a/archiva-docs/src/site/xdoc/tour/index.xml
+++ b/archiva-docs/src/site/xdoc/tour/index.xml
@@ -78,7 +78,7 @@ table.bodyTable tr.b {
             </a>
           </td>
           <td>
-            <a href="security.html">
+            <a href="../adminguide/security.html">
               <img src="../images/tour/security.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
               8. Role-based Security
             </a>
diff --git a/archiva-docs/src/site/xdoc/tour/reports.xml b/archiva-docs/src/site/xdoc/tour/reports.xml
index a26c8a5fd..85eff8812 100644
--- a/archiva-docs/src/site/xdoc/tour/reports.xml
+++ b/archiva-docs/src/site/xdoc/tour/reports.xml
@@ -16,7 +16,7 @@
           troubleshooting problems.
         </p>
         <p>
-          <a href="security.html">Previous: Role-based Security</a> |
+          <a href="../adminguide/security.html">Previous: Role-based Security</a> |
           <strong>Integrity Reports</strong> |
           <a href="audit-log.html">Next: Audit Log Report</a>
         </p>
diff --git a/archiva-docs/src/site/xdoc/tour/rss.xml b/archiva-docs/src/site/xdoc/tour/rss.xml
index 7421c7621..941562509 100644
--- a/archiva-docs/src/site/xdoc/tour/rss.xml
+++ b/archiva-docs/src/site/xdoc/tour/rss.xml
@@ -17,7 +17,7 @@
         <p>
           <a href="virtual-repos.html">Previous: Virtual Repositories</a> |
           <strong>RSS Feeds</strong> |
-          <a href="security.html">Next: Role-based Security</a>
+          <a href="../adminguide/security.html">Next: Role-based Security</a>
         </p>
       </div>
     </section>