X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=doc%2Fpazpar2_conf.xml;h=cf97dfb2f2576b216a9f8ba79f552857e39fa8bf;hb=6639c716d02ad6117ae6053ca18160dbb21a404a;hp=9d08cbcbaec6e3413209c03a27669fc59dfd9b78;hpb=298428237ab753a1644549f9c9c88feeb90d5919;p=pazpar2-moved-to-github.git

diff --git a/doc/pazpar2_conf.xml b/doc/pazpar2_conf.xml
index 9d08cbc..cf97dfb 100644
--- a/doc/pazpar2_conf.xml
+++ b/doc/pazpar2_conf.xml
@@ -400,10 +400,19 @@
 	  Specifies timeout parameters for this service.
 	  The <literal>timeout</literal>
 	  element supports the following attributes: 
-	  <literal>session</literal>, <literal>z3950_connect</literal>,
+	  <literal>session</literal>, <literal>z3950_operation</literal>,
 	  <literal>z3950_session</literal> which specifies
-	  'session timeout', 'Z39.50 connect timeout', 'Z39.50 session timeout'
-	  respectively.
+	  'session timeout', 'Z39.50 operation timeout',
+	  'Z39.50 session timeout' respectively. The Z39.50 operation
+	  timeout is the time Pazpar2 will wait for an active Z39.50/SRU
+	  operation before it gives up (times out). The Z39.50 session
+	  time out is the time Pazpar2 will keep the session alive for
+	  an idle session (no operation).
+	 </para>
+	 <para>
+	  The following is recommended but not required:
+	  z3950_operation (30) &lt; session (60) &lt; z3950_session (180) .
+	  The default values are given in parantheses.
 	 </para>
 	</listitem>
        </varlistentry>