X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=doc%2Fpazpar2_conf.xml;h=86dbdc8a7cac68a4f3816bba29d860b327b17879;hb=85b1f355522cc620452552d76fd517f089c98ab2;hp=4e820224690b97d677e9b2dc9cac81ccb4cea552;hpb=ec408aa062279768cacf3810db429890cc1ce228;p=pazpar2-moved-to-github.git

diff --git a/doc/pazpar2_conf.xml b/doc/pazpar2_conf.xml
index 4e82022..86dbdc8 100644
--- 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>
 
@@ -416,6 +421,29 @@
 	  </varlistentry>
 
 	  <varlistentry>
+	   <term id="icurule">icurule</term>
+	   <listitem>
+	    <para>
+	     Specifies the ICU rule set to be used for normalizing
+	     metadata text. The "display" part of the rule is kept
+	     in the returned metadata record (record+show commands), the
+	     end result - normalized text - is used for performing
+	     within-cluster merge (unique, longest, etc). If the icurule is
+	     omitted, type generic (text) is converted as follows:
+	     any of the characters "<literal> ,/.:([</literal>" are
+	     chopped of prefix and suffix of text content
+	     <emphasis>unless</emphasis> it includes the
+	     characters "<literal>://</literal>" (URL).
+	    </para>
+	    <note>
+	     <para>
+	      Requires Pazpar2 1.9.0 or later.
+	     </para>
+	    </note>
+	   </listitem>
+	  </varlistentry>
+
+	  <varlistentry>
 	   <term>setting</term>
 	   <listitem>
 	    <para>
@@ -740,7 +768,7 @@
 	</listitem>
        </varlistentry>
 
-       <varlistentry>
+       <varlistentry id="service-timeout">
 	<term>timeout</term>
 	<listitem>
 	 <para>
@@ -761,6 +789,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 +1474,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 +1622,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>