X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=doc%2Fpazpar2_conf.xml;h=eea4f75da05ba2de941a07bbd63a69b5f191ec5f;hb=9a39c22aec5de4551d175794e291268cd27626c3;hp=42c7e26ba6872bb0d7bf95d85496612900dbea2f;hpb=16243f5da245028624661f8b6bbd3900d1fdc9d3;p=pazpar2-moved-to-github.git

diff --git a/doc/pazpar2_conf.xml b/doc/pazpar2_conf.xml
index 42c7e26..eea4f75 100644
--- a/doc/pazpar2_conf.xml
+++ b/doc/pazpar2_conf.xml
@@ -73,6 +73,16 @@
     in main thread).
    </para>
   </refsect2>
+  <refsect2 id="config-file">
+   <title>file</title>
+   <para>
+    This configuration takes one attribute <literal>path</literal> which
+    specifies a path to search for local files, such as XSLTs  and settings.
+    The path is a colon separated list of directories. Its default value
+    is "<literal>.</literal>" which is equivalent to the location of the
+    main configuration file (where indeed the file element is given).
+   </para>
+  </refsect2>
   <refsect2 id="config-server">
    <title>server</title>
    <para>
@@ -1102,6 +1112,8 @@
     behavior of the client function.
    </para>
 
+   <variablelist>
+
     <varlistentry>
      <term>pz:allow</term>
      <listitem>
@@ -1294,6 +1306,25 @@
     </varlistentry>
 
     <varlistentry>
+     <term>pz:memcached</term>
+     <listitem>
+      <para>
+       If set and non-empty,
+       <ulink url="&url.libmemcached;">libMemcached</ulink> will
+       configured and enabled for the target.
+       The value of this setting is same as the ZOOM option
+       <literal>memcached</literal>, which  in turn is the configuration
+       string passed to the <function>memcached</function> function
+       of <ulink url="&url.libmemcached;">libMemcached</ulink>.
+      </para>
+      <para>
+       This setting is honored in Pazpar2 1.6.39 or later. Pazpar2 must
+       be using YAZ version 5.0.13 or later.
+      </para>
+     </listitem>
+    </varlistentry>
+
+    <varlistentry>
      <term>pz:nativesyntax</term>
      <listitem>
       <para>
@@ -1439,7 +1470,6 @@
      </listitem>
     </varlistentry>
 
-   <variablelist>
     <varlistentry id="requestsyntax">
      <term>pz:requestsyntax</term>
      <listitem>
@@ -1466,8 +1496,8 @@
      <listitem>
       <para>
        Specifies native sorting for a target where
-       <replaceable>field</replaceable> is a sort criteria (see command
-       show). The value has to components separated by colon: strategy and
+       <replaceable>field</replaceable> is a sort criterion (see command
+       show). The value has two components separated by a colon: strategy and
        native-field. Strategy is one of <literal>z3950</literal>,
        <literal>type7</literal>, <literal>cql</literal>,
        <literal>sru11</literal>, or <literal>embed</literal>.