merge repositories doc with new ui screenshots

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1388760 13f79535-47bb-0310-9956-ffa450edef68
2012-09-22 09:32:29 +00:00 · 2012-09-22 09:32:29 +00:00 · 615d6a7b70
parent fe6bbb72e8
commit 615d6a7b70
4 changed files with 6 additions and 2 deletions
--- a/archiva-docs/src/site/apt/adminguide/staging-repositories.apt
+++ b/archiva-docs/src/site/apt/adminguide/staging-repositories.apt
@ -54,11 +54,15 @@ Staging Repositories

 * Merging Repositories

-  To merge or promote the artifacts in a staging repository to the managed repository, just click the <<<Merge>>> button
-  in the repository configuration page.
+  To merge or promote the artifacts in a staging repository to the managed repository, just click the <<<Merge this repository>>> button
+  in the repositories configuration page.

 [../images/repository-merge.png] Merge Button

+  You will be able to select which target repository to use for merging
+
+[../images/repository-merge-select-target.png]
+
  Archiva will check for conflicting artifacts between the two repositories, and list them (if it finds conflicts).
  The user will be asked to choose between two actions:

--- a/archiva-docs/src/site/resources/images/conflicting-artifacts.png
+++ b/archiva-docs/src/site/resources/images/conflicting-artifacts.png
--- a/archiva-docs/src/site/resources/images/repository-merge-select-target.png
+++ b/archiva-docs/src/site/resources/images/repository-merge-select-target.png
--- a/archiva-docs/src/site/resources/images/repository-merge.png
+++ b/archiva-docs/src/site/resources/images/repository-merge.png