merge repositories doc with new ui screenshots

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

diff --git a/archiva-docs/src/site/apt/adminguide/staging-repositories.apt b/archiva-docs/src/site/apt/adminguide/staging-repositories.apt
index 7cbca385cbec1abe9bf1401ea3a455558e446ec8..b67293949570dfb36dbe70e91e51bc44403ca43b 100644 (file)
--- 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:
 

diff --git a/archiva-docs/src/site/resources/images/conflicting-artifacts.png b/archiva-docs/src/site/resources/images/conflicting-artifacts.png
old mode 100755 (executable)
new mode 100644 (file)
index ac53c3a..c545e8d
Binary files a/archiva-docs/src/site/resources/images/conflicting-artifacts.png and b/archiva-docs/src/site/resources/images/conflicting-artifacts.png differ

diff --git a/archiva-docs/src/site/resources/images/repository-merge-select-target.png b/archiva-docs/src/site/resources/images/repository-merge-select-target.png
new file mode 100644 (file)
index 0000000..952652d
Binary files /dev/null and b/archiva-docs/src/site/resources/images/repository-merge-select-target.png differ

diff --git a/archiva-docs/src/site/resources/images/repository-merge.png b/archiva-docs/src/site/resources/images/repository-merge.png
old mode 100755 (executable)
new mode 100644 (file)
index 3c41b80..3df0fb2
Binary files a/archiva-docs/src/site/resources/images/repository-merge.png and b/archiva-docs/src/site/resources/images/repository-merge.png differ