diff options
| author | Olivier Lamy <olamy@apache.org> | 2012-09-22 09:32:29 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2012-09-22 09:32:29 +0000 |
| commit | 615d6a7b70730ecf7406e7c38ea9126f511606cf (patch) | |
| tree | ae71055e03ffb7493cdb6da73b69bfd9e57072db | |
| parent | fe6bbb72e8b1e91aa576377c6432245156c9cd2a (diff) | |
| download | archiva-615d6a7b70730ecf7406e7c38ea9126f511606cf.tar.gz archiva-615d6a7b70730ecf7406e7c38ea9126f511606cf.zip | |
merge repositories doc with new ui screenshots
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1388760 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | archiva-docs/src/site/apt/adminguide/staging-repositories.apt | 8 | ||||
| -rw-r--r--[-rwxr-xr-x] | archiva-docs/src/site/resources/images/conflicting-artifacts.png | bin | 22506 -> 54854 bytes | |||
| -rw-r--r-- | archiva-docs/src/site/resources/images/repository-merge-select-target.png | bin | 0 -> 80632 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | archiva-docs/src/site/resources/images/repository-merge.png | bin | 46484 -> 138498 bytes |
4 files changed, 6 insertions, 2 deletions
diff --git a/archiva-docs/src/site/apt/adminguide/staging-repositories.apt b/archiva-docs/src/site/apt/adminguide/staging-repositories.apt index 7cbca385c..b67293949 100644 --- 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 Binary files differindex ac53c3a5b..c545e8d96 100755..100644 --- a/archiva-docs/src/site/resources/images/conflicting-artifacts.png +++ b/archiva-docs/src/site/resources/images/conflicting-artifacts.png 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 Binary files differnew file mode 100644 index 000000000..952652d69 --- /dev/null +++ b/archiva-docs/src/site/resources/images/repository-merge-select-target.png diff --git a/archiva-docs/src/site/resources/images/repository-merge.png b/archiva-docs/src/site/resources/images/repository-merge.png Binary files differindex 3c41b80e4..3df0fb2e6 100755..100644 --- a/archiva-docs/src/site/resources/images/repository-merge.png +++ b/archiva-docs/src/site/resources/images/repository-merge.png |
