X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=doc%2Fpazpar2_conf.xml;h=fbd39fbd40315ce3382f41b90990677fbe0605fd;hb=0bb0ee0e00d750808e228b991c78cb4838bc989d;hp=60cd710968e8d8319676705528629d3d157c2fa0;hpb=d71af70a6a3546cab2e370140d47c1bd628d9753;p=pazpar2-moved-to-github.git

diff --git a/doc/pazpar2_conf.xml b/doc/pazpar2_conf.xml
index 60cd710..fbd39fb 100644
--- a/doc/pazpar2_conf.xml
+++ b/doc/pazpar2_conf.xml
@@ -322,6 +322,11 @@
 	     all elements), or 'no' (don't merge; this is the
 	     default);
 	    </para>
+	    <para>
+	     Pazpar 1.6.24 also offers a new value for merge, 'first', which
+	     is like 'all' but only takes all from first database that returns
+	     the particular metadata field.
+	    </para>
 	   </listitem>
 	  </varlistentry>
 	  
@@ -361,6 +366,22 @@
 	  </varlistentry>
 	  
 	  <varlistentry>
+	   <term id="limitcluster">limitcluster</term>
+	   <listitem>
+	    <para>
+	     Allow a limit on merged metadata. The value of this attribute
+	     is the name of actual metadata content to be used for matching
+	     (most often same name as metadata name).
+	    </para>
+	    <note>
+	     <para>
+	      Requires Pazpar2 1.6.23 or later.
+	     </para>
+	    </note>
+	   </listitem>
+	  </varlistentry>
+	  
+	  <varlistentry>
 	   <term id="metadata_limitmap">limitmap</term>
 	   <listitem>
 	    <para>