From e35c74ee570e40b2ef4ce6245c73b90d9bbfef8d Mon Sep 17 00:00:00 2001
From: skygo <skygo@unknown>
Date: Thu, 6 Mar 2014 00:58:01 +0000
Subject: [PATCH] remove /archiva/ in repository url for all docs

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1574734 13f79535-47bb-0310-9956-ffa450edef68
---
 archiva-docs/src/site/apt/adminguide/repositories.apt  |  4 ++--
 archiva-docs/src/site/apt/userguide/deploy.apt         |  8 ++++----
 archiva-docs/src/site/apt/userguide/rss.apt            |  6 ++++--
 .../src/site/apt/userguide/using-repository.apt        |  6 +++---
 .../src/site/apt/userguide/virtual-repositories.apt    | 10 +++++-----
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/archiva-docs/src/site/apt/adminguide/repositories.apt b/archiva-docs/src/site/apt/adminguide/repositories.apt
index c60b49a23..850b30a3d 100644
--- a/archiva-docs/src/site/apt/adminguide/repositories.apt
+++ b/archiva-docs/src/site/apt/adminguide/repositories.apt
@@ -101,7 +101,7 @@ Understanding Repository Configuration of Apache Archiva
   access the repository via http(s)/webdav. The url has the following format:
 
 +----+
-http://[URL TO ARCHIVA]/repository/[REPOSITORY ID] (e.g. http://localhost:8080/archiva/repository/releases).
+http://[URL TO ARCHIVA]/repository/[REPOSITORY ID] (e.g. http://localhost:8080/repository/releases).
 +----+
 
   A pom snippet is also available for each repository. The
@@ -170,7 +170,7 @@ http://[URL TO ARCHIVA]/repository/[REPOSITORY ID] (e.g. http://localhost:8080/a
 
   <<Since 1.4-M4>>:
   If you have configured download remote index, those files (Maven Indexer project format) will be available in the path
-  http://archiva/repository/id/.index (you can consume those files for IDE)
+  http://[URL TO ARCHIVA]/repository/id/.index (you can consume those files for IDE)
 
 * Scanning a Repository
 
diff --git a/archiva-docs/src/site/apt/userguide/deploy.apt b/archiva-docs/src/site/apt/userguide/deploy.apt
index 16994939d..1fcda9eb8 100644
--- a/archiva-docs/src/site/apt/userguide/deploy.apt
+++ b/archiva-docs/src/site/apt/userguide/deploy.apt
@@ -82,12 +82,12 @@ Deploying to Repository
     <repository>
       <id>archiva.internal</id>
       <name>Internal Release Repository</name>
-      <url>http://reposerver.mycompany.com:8080/archiva/repository/internal/</url>
+      <url>http://reposerver.mycompany.com:8080/repository/internal/</url>
     </repository>
     <snapshotRepository>
       <id>archiva.snapshots</id>
       <name>Internal Snapshot Repository</name>
-      <url>http://reposerver.mycompany.com:8080/archiva/repository/snapshots/</url>
+      <url>http://reposerver.mycompany.com:8080/repository/snapshots/</url>
     </snapshotRepository>
   </distributionManagement>
   <!-- omitted xml -->
@@ -108,12 +108,12 @@ Deploying to Repository
     <repository>
       <id>archiva.internal</id>
       <name>Internal Release Repository</name>
-      <url>dav:http://reposerver.mycompany.com:8080/archiva/repository/internal/</url>
+      <url>dav:http://reposerver.mycompany.com:8080/repository/internal/</url>
     </repository>
     <snapshotRepository>
       <id>archiva.snapshots</id>
       <name>Internal Snapshot Repository</name>
-      <url>dav:http://reposerver.mycompany.com:8080/archiva/repository/snapshots/</url>
+      <url>dav:http://reposerver.mycompany.com:8080/repository/snapshots/</url>
     </snapshotRepository>
   </distributionManagement>
   <!-- omitted xml -->
diff --git a/archiva-docs/src/site/apt/userguide/rss.apt b/archiva-docs/src/site/apt/userguide/rss.apt
index 1439b9efe..cb6d8c69a 100644
--- a/archiva-docs/src/site/apt/userguide/rss.apt
+++ b/archiva-docs/src/site/apt/userguide/rss.apt
@@ -34,7 +34,8 @@ RSS Feeds
 * New Artifacts In Repository
 
   For  versions 1.1 and 1.1.1, the default url for this feed is <<<http://[hostname]:[port]/archiva/rss/rss_feeds?repoId=[repositoryId]>>>.
-  But since version 1.1.2, this has been changed to <<<http://[hostname]:[port]/archiva/feeds/[repositoryId]>>>
+  But since version 1.1.2, this has been changed to <<<http://[hostname]:[port]/archiva/feeds/[repositoryId]>>>.
+  Since version 2.0.0 feed changed changed to <<<http://[hostname]:[port]/feeds/[repositoryId]>>>.
 
   There are two ways to subscribe to this feed:
 
@@ -49,7 +50,8 @@ RSS Feeds
 * New Versions of an Artifact
 
   The default url for this feed for versions 1.1 and 1.1.1 is <<<http://[hostname]:[port]/archiva/rss/rss_feeds?groupId=[groupId]&artifactId=[artifactId]>>>
-  but was changed to <<<http://[hostname]:[port]/archiva/feeds/[groupId]/[artifactId]>>> since version 1.1.2 for consistency purposes.
+  but was changed to <<<http://[hostname]:[port]/archiva/feeds/[groupId]/[artifactId]>>> since version 1.1.2 for consistency purposes. 
+  Since version 2.0.0 feed changed changed to <<<http://[hostname]:[port]/feeds/[groupId]/[artifactId]>>>
 
   You could subscribe to the feed the same way as specified in the New Artifacts In Repository section except that in #1, you
   need to specify the <<<groupId>>> and <<<artifactId>>> instead of the <<<repositoryId>>>. And in #2, you need to go to the
diff --git a/archiva-docs/src/site/apt/userguide/using-repository.apt b/archiva-docs/src/site/apt/userguide/using-repository.apt
index b35a41ebc..bc6a13449 100644
--- a/archiva-docs/src/site/apt/userguide/using-repository.apt
+++ b/archiva-docs/src/site/apt/userguide/using-repository.apt
@@ -38,7 +38,7 @@ Configuring Maven 2 to use an Archiva repository
   <mirrors>
     <mirror>
       <id>archiva.default</id>
-      <url>http://repo.mycompany.com:8080/archiva/repository/internal/</url>
+      <url>http://repo.mycompany.com:8080/repository/internal/</url>
       <mirrorOf>external:*</mirrorOf>
     </mirror>
   </mirrors>
@@ -58,7 +58,7 @@ Mirror Settings}} for more information.>
     <!-- omitted xml -->
     <mirror>
       <id>archiva.apache.snapshots</id>
-      <url>http://repo.mycompany.com:8080/archiva/repository/snapshots/</url>
+      <url>http://repo.mycompany.com:8080/repository/snapshots/</url>
       <mirrorOf>apache.snapshots</mirrorOf>
     </mirror>
     <!-- omitted xml -->
@@ -114,7 +114,7 @@ Mirror Settings}} for more information.>
 +-------------------------------------------------------------------------+
     <repository>
       <id>repository-1</id>
-      <url>http://repo.mycompany.com:8080/archiva/repository/internal/</url>
+      <url>http://repo.mycompany.com:8080/repository/internal/</url>
       <releases>
         <enabled>true</enabled>
       </releases>
diff --git a/archiva-docs/src/site/apt/userguide/virtual-repositories.apt b/archiva-docs/src/site/apt/userguide/virtual-repositories.apt
index dcd76279a..5c60e451f 100644
--- a/archiva-docs/src/site/apt/userguide/virtual-repositories.apt
+++ b/archiva-docs/src/site/apt/userguide/virtual-repositories.apt
@@ -38,7 +38,7 @@ Virtual Repositories
       <repositories>
         <repository>
           <id>internal.releases</id>
-          <url>http://localhost:8080/archiva/repository/internal.releases/</url>
+          <url>http://localhost:8080/repository/internal.releases/</url>
           <releases>
             <enabled>true</enabled>
           </releases>
@@ -48,7 +48,7 @@ Virtual Repositories
         </repository>
         <repository>
           <id>third.party.repo</id>
-          <url>http://localhost:8080/archiva/repository/third.party.repo/</url>
+          <url>http://localhost:8080/repository/third.party.repo/</url>
           <releases>
             <enabled>true</enabled>
           </releases>
@@ -58,7 +58,7 @@ Virtual Repositories
         </repository>
         <repository>
           <id>snapshots</id>
-          <url>http://localhost:8080/archiva/repository/snapshots/</url>
+          <url>http://localhost:8080/repository/snapshots/</url>
           <releases>
             <enabled>false</enabled>
           </releases>
@@ -88,7 +88,7 @@ Virtual Repositories
       <repositories>
         <repository>
           <id>internal.releases</id>
-          <url>http://localhost:8080/archiva/repository/[repository_group_id]/</url>
+          <url>http://localhost:8080/repository/[repository_group_id]/</url>
         </repository>
       </repositories>
     </profile>
@@ -121,7 +121,7 @@ Virtual Repositories
 
 [../images/repository-groups.png]
 
-  [[3]] Now add the virtual repository URL <<<http://[host]:[port]/archiva/repository/[repository_group_id]/>>>
+  [[3]] Now add the virtual repository URL <<<http://[host]:[port]/repository/[repository_group_id]/>>>
   into your settings.xml the same way you configure regular repositories -- as a <mirror> or as an additional <repository>.
 
   [[4]] If the repositories under the group are secured, you must set your Archiva login credentials in your settings.xml as
-- 
2.39.5