[MRM-815] aggregate indices for repository groups.

add a note on this new feature in virtual-repositories documentation.

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

diff --git a/archiva-docs/src/site/apt/release-notes.apt.vm b/archiva-docs/src/site/apt/release-notes.apt.vm
index ff5e0571c8bd20a9a7fadc5345830d401e8751ff..3acf1216bf0f3aa0ca0003b777d2dbd04ec42f68 100644 (file)
--- a/archiva-docs/src/site/apt/release-notes.apt.vm
+++ b/archiva-docs/src/site/apt/release-notes.apt.vm
@@ -38,7 +38,7 @@ Release Notes for Archiva ${project.version}
 
   Some new features has been added in ${project.version}:
 
-  * Repositories group can now return a merged index in path .indexer.
+  * Repositories group can now return a merged index in path .indexer .
 
 * Compatibility Changes
 

diff --git a/archiva-docs/src/site/apt/userguide/virtual-repositories.apt b/archiva-docs/src/site/apt/userguide/virtual-repositories.apt
index 905a0caff5eb489e9953ecb8766b192828e134e6..252eae324a8fdcb7b53b85e3b80fcd45fbb8a7a1 100644 (file)
--- a/archiva-docs/src/site/apt/userguide/virtual-repositories.apt
+++ b/archiva-docs/src/site/apt/userguide/virtual-repositories.apt
@@ -133,4 +133,13 @@ Virtual Repositories
   User will be asked to authenticate if the 'guest' account is not enabled for the repositories. Only those repositories
   which the user has permission to access will be shown.
 
+* Merged index
+
+  With version 1.4-M2, you can download a merged index for a virtual repository. This merged index is generated "on the fly" with
+  merging repositories index for which the current user has karma.
+  This merged index is available in the path .indexer .
+
+  To not generate this merged index on each request, there is a ttl value for build merged index.
+  This ttl has a default value of 30 minutes. You can change it with modifying the sys props value <<<archiva.tmp.group.index.ttl>>> (see your <<<wrapper.conf>>> file)
+