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

diff --git a/doc/pazpar2_conf.xml b/doc/pazpar2_conf.xml
index a45d77d..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>