Ignore local0.ent

[pazpar2-moved-to-github.git] / doc / pazpar2_conf.xml

diff --git a/doc/pazpar2_conf.xml b/doc/pazpar2_conf.xml
index a45d77d..bcdf8ec 100644 (file)
--- 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>
          
@@ -1269,6 +1274,24 @@
      </listitem>
     </varlistentry>
     <varlistentry>
+     <term>pz:extendrecs</term>
+     <listitem>
+      <para>
+       If a show command goes to the boundary of a result set for a
+       database - depends on sorting - and pz:extendrecs is set to a larger
+       value of pz:maxrecs, then Pazpar2 wait for show to fetch remaining
+       records - up to pz:extendrecs. This setting is best used if a
+       database does native sorting, because the result set otherwise may
+       be completely re-sorted during extended fetch.
+      </para>
+      <note>
+       <para>
+       The pz:extendrecs setting is supported in Pazpar2 version 1.6.26.
+       </para>
+      </note>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
      <term>pz:presentchunk</term>
      <listitem>
       <para>