X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=doc%2Fpazpar2_conf.xml;h=158b3beaade4a3e74645a51291cdb5f07b731f5b;hb=10ca5845f61713f01f0f179f38643e0863e17fe5;hp=6db09992ecb7a94b483112fb1aca243bcb2c681f;hpb=b7b3b09b5bf04a832b9602d4717d7e1eb512079c;p=pazpar2-moved-to-github.git

diff --git a/doc/pazpar2_conf.xml b/doc/pazpar2_conf.xml
index 6db0999..158b3be 100644
--- a/doc/pazpar2_conf.xml
+++ b/doc/pazpar2_conf.xml
@@ -5,10 +5,10 @@
      %local;
      <!ENTITY % entities SYSTEM "entities.ent">
      %entities;
-     <!ENTITY % common SYSTEM "common/common.ent">
-     %common;
+     <!ENTITY % idcommon SYSTEM "common/common.ent">
+     %idcommon;
 ]>
-<!-- $Id: pazpar2_conf.xml,v 1.24 2007-05-25 12:30:27 marc Exp $ -->
+<!-- $Id: pazpar2_conf.xml,v 1.26 2007-06-06 12:02:48 marc Exp $ -->
 <refentry id="pazpar2_conf">
  <refentryinfo>
   <productname>Pazpar2</productname>
@@ -101,21 +101,6 @@
 	</varlistentry>
 
 	<varlistentry>
-	  <term>zproxy</term>
-	  <listitem>
-	    <para>
-	      If this item is given, pazpar2 will send all Z39.50
-	      packages through this Z39.50 proxy server.
-              At least one of the 'host' and 'post' attributes is required.
-              The 'host' attribute may contain both host name and port
-	      number, seperated by a colon ':', or only the host name.
-              An empty 'host' attribute sets the Z39.50 host address
-	      to 'localhost'.  
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
 	  <term>icu_chain</term>
 	  <listitem>
 	    <para>
@@ -326,11 +311,6 @@
   <listen port="9004"/>
   <proxy host="us1.indexdata.com" myurl="us1.indexdata.com"/>
 
-  <!-- <zproxy host="localhost" port="9000"/> -->
-  <!-- <zproxy host="localhost:9000"/> -->
-  <!-- <zproxy port="9000"/> -->
-
-
   <!-- optional ICU ranking configuration example -->
   <!--
   <icu_chain id="el:word" locale="el">
@@ -557,7 +537,7 @@
 <settings target="*">
 
   <!-- This file introduces default settings for pazpar2 -->
-  <!-- $Id: pazpar2_conf.xml,v 1.24 2007-05-25 12:30:27 marc Exp $ -->
+  <!-- $Id: pazpar2_conf.xml,v 1.26 2007-06-06 12:02:48 marc Exp $ -->
 
   <!-- mapping for unqualified search -->
   <set name="pz:cclmap:term" value="u=1016 t=l,r s=al"/>
@@ -731,6 +711,16 @@
 	    </para>
 	  </listitem>
 	</varlistentry>
+	<varlistentry>
+	  <term>pz:zproxy</term>
+	  <listitem>
+	    <para>
+	      The 'pz:zproxy' setting has the value syntax 
+              'host.internet.adress:port', it is used to tunnel Z39.50
+              requests through the named Z39.50 proxy.
+	    </para>
+	  </listitem>
+	</varlistentry>
       </variablelist>
     </refsect2>