Log YAZ version upon start PAZ-993

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

diff --git a/doc/pazpar2_conf.xml b/doc/pazpar2_conf.xml
index 4e82022..8d64acc 100644 (file)
--- a/doc/pazpar2_conf.xml
+++ b/doc/pazpar2_conf.xml
@@ -262,6 +262,11 @@
             articles), and 'no' (no sorting). The default value is
             'no'.
            </para>
+           <para>
+            When 'skiparticle' is used, some common articles from the
+            English and German languages are ignored. At present the
+            list is: 'the', 'den', 'der', 'die', 'des', 'an', 'a'.
+           </para>
           </listitem>
          </varlistentry>
 
@@ -740,7 +745,7 @@
        </listitem>
        </varlistentry>
 
-       <varlistentry>
+       <varlistentry id="service-timeout">
        <term>timeout</term>
        <listitem>
         <para>
@@ -761,6 +766,10 @@
          z3950_operation (30) &lt; session (60) &lt; z3950_session (180) .
          The default values are given in parantheses.
         </para>
+        <para>
+         The Z39.50 operation timeout may be set per database. Refer to
+         <xref linkend="pztimeout"/>.
+        </para>
        </listitem>
        </varlistentry>
       </variablelist>     <!-- Data elements in service directive -->
@@ -1442,16 +1451,17 @@
      <listitem>
       <para>
        Specifies that a target is preferred, e.g. possible local, faster
-       target. Using block=pref on show command will wait for all these
+       target. Using block=preferred on <link linkend="command-show">
+       show command</link> will wait for all these
        targets to return records before releasing the block.
-       If no target is preferred, the block=pref will identical to block=1,
-       which release when one target has returned records.
+       If no target is preferred, the block=preferred will identical to
+       block=1, which release when one target has returned records.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term>pz:presentchunk</term>
+     <term>pz:present_chunk</term>
      <listitem>
       <para>
        Controls the chunk size in present requests. Pazpar2 will
@@ -1589,6 +1599,23 @@
      </listitem>
     </varlistentry>
 
+
+    <varlistentry id="pztimeout">
+     <term>pz:timeout</term>
+     <listitem>
+      <para>
+       Specifies timeout for operation (eg search, and fetch) for
+       a database. This overrides the z3650_operation timeout
+       that is given for a service. See <xref linkend="service-timeout"/>.
+      </para>
+      <note>
+       <para>
+       The timeout facility is supported for Pazpar2 version 1.8.4 and later.
+       </para>
+      </note>
+     </listitem>
+    </varlistentry>
+
     <varlistentry id="pzurl">
      <term>pz:url</term>
      <listitem>