From: Olivier Lamy <olamy@apache.org>
Date: Sat, 8 Feb 2014 12:02:49 +0000 (+0000)
Subject: note in upgrade guide regarding webapp context changed
X-Git-Tag: archiva-2.0.1~47
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c6f7c48f2bdd6d0835dfa7556712289aa9f96d77;p=archiva.git

note in upgrade guide regarding webapp context changed

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

diff --git a/archiva-docs/src/site/apt/adminguide/upgrade.apt b/archiva-docs/src/site/apt/adminguide/upgrade.apt
index cff33e804..973cf53c1 100644
--- a/archiva-docs/src/site/apt/adminguide/upgrade.apt
+++ b/archiva-docs/src/site/apt/adminguide/upgrade.apt
@@ -65,7 +65,7 @@ Upgrading Archiva
 ** Updated Jetty configuration
 
   If you are using the Jetty standalone configuration with a custom
-  <<<jetty.xml>>>, note that it has been upgraded to Jetty 7 as of Archiva 1.4-M2.
+  <<<jetty.xml>>>, note that it has been upgraded to Jetty 8 as of Archiva 1.4-M2.
   You will need to recreate your customisations using the <<<jetty.xml>>> shipped
   with Archiva.
 
@@ -73,10 +73,6 @@ Upgrading Archiva
   inside the Archiva application base directory (alongside <<<conf>>>, <<<data>>>
   and <<<logs>>>).
 
-* Upgrading Archiva to 1.2.2
+  The default webapp context is now / (see {{{./adminguide/standalone.html} Standalone Distribution}})
 
-   Since Archiva 1.2.2, the Jetty version has been upgraded to 6.1.19.
-   If upgrading to Archiva 1.2.2 (or higher versions), there is a need to update the library contents listed in
-   <<<ARCHIVA_BASE/conf/wrapper.conf>>> with the ones included in the new distribution if the <<<ARCHIVA_BASE>>>
-   directory is separate from the installation.