Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

diff --combined doc/pazpar2_conf.xml
index 7777636,cf97dfb..d425733
--- 1/doc/pazpar2_conf.xml
--- 2/doc/pazpar2_conf.xml
+++ b/doc/pazpar2_conf.xml
@@@ -400,10 -400,19 +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>
@@@ -825,20 -834,6 +834,20 @@@
         Provides the path of an XSLT stylesheet which will be used to
         map incoming records to the internal representation.
        </para>
 +      <para>
 +       When mapping MARC XML records, XSLT can be bypassed for increased 
 +       performance with the alternate "MARC map" format.  Provide the
 +       path of a file with extension ".mmap" containing on each line:
 +       <programlisting>
 +        &lt;field&gt; &lt;subfield&gt; &lt;metadata element&gt;</programlisting>
 +       For example:
 +       <programlisting>
 +        245 a title
 +        500 $ description
 +        773 * citation</programlisting>
 +       To map the field value specify a subfield of '$'.  To store a 
 +       concatenation of all subfields, specify a subfield of '*'.
 +      </para>
       </listitem>
      </varlistentry>
      <varlistentry>