X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;ds=sidebyside;f=doc%2Fpazpar2_conf.xml;h=1d9d4790eacf2755ff56e94e32f3b88e1462b244;hb=b0325ece208dabe5593488eedbcfdba4f4a4b439;hp=4e820224690b97d677e9b2dc9cac81ccb4cea552;hpb=ec408aa062279768cacf3810db429890cc1ce228;p=pazpar2-moved-to-github.git

diff --git a/doc/pazpar2_conf.xml b/doc/pazpar2_conf.xml
index 4e82022..1d9d479 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>
 
@@ -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 -->
@@ -1451,7 +1460,7 @@
     </varlistentry>
 
     <varlistentry>
-     <term>pz:presentchunk</term>
+     <term>pz:present_chunk</term>
      <listitem>
       <para>
        Controls the chunk size in present requests. Pazpar2 will
@@ -1589,6 +1598,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>