[MRM-1165]

o move out upgrade docs to a separate page


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

4 files changed, 26 insertions, 21 deletions

diff --git a/archiva-docs/src/site/apt/adminguide/installing.apt b/archiva-docs/src/site/apt/adminguide/installing.apt
index 1aba9bd96..6f018dbf9 100644
--- a/archiva-docs/src/site/apt/adminguide/installing.apt
+++ b/archiva-docs/src/site/apt/adminguide/installing.apt
@@ -13,3 +13,5 @@ Installing Apache Archiva
 
     * {{{webapp.html} Installing as a web application}}
 
+    * {{{upgrade.html} Upgrading to a new version}}
+
diff --git a/archiva-docs/src/site/apt/adminguide/standalone.apt b/archiva-docs/src/site/apt/adminguide/standalone.apt
index bb07193cd..5e1d8ed70 100644
--- a/archiva-docs/src/site/apt/adminguide/standalone.apt
+++ b/archiva-docs/src/site/apt/adminguide/standalone.apt
@@ -155,24 +155,3 @@ Installing Standalone Distribution of Apache Archiva
  Archiva User DB on Derby Network Server}}
 
 
-{Upgrading Archiva}
-
-   Upgrading Archiva is straightforward if the directions for separating the base from the installation above are followed. Simply retain the <<<data/repositories>>> and <<<data/databases/users>>> directories,
-   and the configuration files (in the conf directory, or the other locations specified above) and use a new extracted installation of Archiva.
-
-   Note that the <<<users>>> database must always be retained as it contains the permissions and user information across versions. However,
-   in order to take advantage of the improvements in search in Archiva 1.1 (and higher versions), s.a. search by java class/package/method, the archiva database must
-   be re-created. So you need to delete the <<<data/databases/archiva>>> directory, delete the <<<.index>>> directories of your respective repositories, and execute the repository and database scanners after
-   starting Archiva.
-
-   The repository data is portable across versions, and multiple versions can be configured to look at the same repositories (though not run simultaneously).
-
-* Upgrading Archiva from 1.1 to 1.2
-
-   Because of the changes in the search implementation in 1.2, a few additional steps need to be performed when upgrading Archiva from 1.x to
-   1.2. Since the format of the index has changed in 1.2, the old index directory (which is located at <<</path/to/repo/.index>>> by default) needs to
-   be removed. And in order for the artifacts in the repository to be indexed again, the last modified date of the artifacts need to be updated.
-   To do this, just execute <<find [REPOSITORY_DIRECTORY_NAME] | xargs touch>> at the base directory where the repository resides. Execute the repository
-   scanning so that the new index will be generated.
-
-
diff --git a/archiva-docs/src/site/apt/adminguide/upgrade.apt b/archiva-docs/src/site/apt/adminguide/upgrade.apt
new file mode 100644
index 000000000..69348a8f3
--- /dev/null
+++ b/archiva-docs/src/site/apt/adminguide/upgrade.apt
@@ -0,0 +1,23 @@
+ ------
+ Upgrading Archiva
+ ------
+
+Upgrading Archiva
+
+   Upgrading Archiva is straightforward if the directions for separating the base from the installation above are followed. Simply retain the <<<data/repositories>>> and <<<data/databases/users>>> directories,
+   and the configuration files (in the conf directory, or the other locations specified above) and use a new extracted installation of Archiva.
+
+   Note that the <<<users>>> database must always be retained as it contains the permissions and user information across versions. However,
+   in order to take advantage of the improvements in search in Archiva 1.1 (and higher versions), s.a. search by java class/package/method, the archiva database must
+   be re-created. So you need to delete the <<<data/databases/archiva>>> directory, delete the <<<.index>>> directories of your respective repositories, and execute the repository and database scanners after
+   starting Archiva.
+
+   The repository data is portable across versions, and multiple versions can be configured to look at the same repositories (though not run simultaneously).
+
+* Upgrading Archiva from 1.1 to 1.2
+
+   Because of the changes in the search implementation in 1.2, a few additional steps need to be performed when upgrading Archiva from 1.x to
+   1.2. Since the format of the index has changed in 1.2, the old index directory (which is located at <<</path/to/repo/.index>>> by default) needs to
+   be removed. And in order for the artifacts in the repository to be indexed again, the last modified date of the artifacts need to be updated.
+   To do this, just execute <<find [REPOSITORY_DIRECTORY_NAME] | xargs touch>> at the base directory where the repository resides. Execute the repository
+   scanning so that the new index will be generated.
diff --git a/archiva-docs/src/site/site.xml b/archiva-docs/src/site/site.xml
index 333bb13c2..12c149c43 100644
--- a/archiva-docs/src/site/site.xml
+++ b/archiva-docs/src/site/site.xml
@@ -48,6 +48,7 @@
       <item name="Installing Archiva"        href="/adminguide/installing.html" collapse="true">
         <item name="Installing Standalone"   href="/adminguide/standalone.html" />
         <item name="Installing as a WAR"     href="/adminguide/webapp.html" />
+        <item name="Upgrading to a New Version"     href="/adminguide/upgrade.html" />
       </item>
       <item name="Databases"                 href="/adminguide/databases.html" />
       <item name="Security"                  href="/adminguide/security.html" collapse="true">