[MRM-700] Review the documentation on deploying to Archiva for inconsistent repositor...

Merged from: r628786

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

diff --git a/archiva-1.0.x/archiva-docs/src/site/apt/userguide/deploy.apt b/archiva-1.0.x/archiva-docs/src/site/apt/userguide/deploy.apt
index 3421214794fc337e045f77b46895064cc051c28f..e0d133390d6af9c060245b9985243b03c46ef6f5 100644 (file)
--- a/archiva-1.0.x/archiva-docs/src/site/apt/userguide/deploy.apt
+++ b/archiva-1.0.x/archiva-docs/src/site/apt/userguide/deploy.apt
@@ -17,7 +17,12 @@ Deploying to Repository
     ...
     <servers>
       <server>
-        <id>deployment.webdav</id>
+        <id>archiva.internal</id>
+        <username>{archiva-deployment-user}</username>
+        <password>{archiva-deployment-pwd}</password>
+      </server>
+      <server>
+        <id>archiva.snapshots</id>
         <username>{archiva-deployment-user}</username>
         <password>{archiva-deployment-pwd}</password>
       </server>
@@ -29,7 +34,9 @@ Deploying to Repository
 
 * Deploying to Archiva using WebDAV
 
-  [[1]] Configure the <<<distributionManagement>>> part of your <<<pom.xml>>> (customising the URLs as needed)
+  [[1]] Configure the <<<distributionManagement>>> part of your <<<pom.xml>>> (customising the URLs as needed).
+        The <<<id>>> of the repository in <<<distributionManagement>>> <<must>> match the <<<id>>> of the <<<server>>>
+        element in <<<settings.xml>>>.
  
 +-------------------------------------------------------------------------+
   <project>
@@ -115,7 +122,7 @@ Deploying to Repository
   
 +------+
 mvn deploy:deploy-file -Dfile=filename.jar -DpomFile=filename.pom
-    -DrepositoryId=deployment.webdav
+    -DrepositoryId=archiva.internal
     -Durl=dav:http://repo.mycompany.com:8080/repository/internal/
 +------+