X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=doc%2Freference.xml;h=caebaf157e24a07a968eba7ad86cd3e0c6c7e5da;hb=c2102bf5035278bef1600520805f3dc0a44f9a91;hp=158f97db9ed4241073d818c0ae2f538b241f4a98;hpb=d119ba229b6c9257c4efb634bf7425d6595196ff;p=yazproxy-moved-to-github.git

diff --git a/doc/reference.xml b/doc/reference.xml
index 158f97d..caebaf1 100644
--- a/doc/reference.xml
+++ b/doc/reference.xml
@@ -293,7 +293,7 @@
    </section>
 
    <section id="proxy-config-max-sockets">
-    <title>client-timeout</title>
+    <title>max-sockets</title>
     <para>
      The element <literal>max-sockets</literal> is the child of element
      <literal>target</literal> and specifies the maximum number of sockets
@@ -423,7 +423,8 @@
     <title>syntax</title>
     <para>
      The <literal>syntax</literal> element specifies accept or reject
-     or a particular record syntax request from the client.
+     or a particular record syntax request from the client. It also
+     allows record conversion of XML records via XSLT.
     </para>
     <para>
      The <literal>syntax</literal> has one required attribute:
@@ -449,10 +450,28 @@
      record to OPACXML.
     </para>
     <para>
+      When <literal>marcxml</literal> is used, yazproxy assumes
+      that records retrieved from the backend are encoded in the
+      <ulink url="&url.marc8;">MARC-8</ulink> character set.
+      This is correct for most MARC21 based systems, but not for 
+      other MARC variants or UTF-8 based MARC21 systems.
+      The <literal>backendcharset</literal> attribute specifies
+      the character set of the MARC records to be converted.
+    </para>
+    <para>
      If attribute <literal>backendtype</literal> is given, that holds the
      record syntax to be transmitted to backend.
     </para>
     <para>
+     If attribute <literal>backendelementset</literal> is given, that holds
+     elementset to be transmitted to backend. If
+     <literal>backendelementset</literal> is omitted, the element
+     set from client is used, except if <literal>marcxml</literal> is used.
+     If no <literal>backendelementset</literal> is given and
+     <literal>marcxml</literal> is used, the elementset is omitted in
+     request to backend.
+    </para>
+    <para>
      If attribute <literal>stylesheet</literal> is given, the proxy
      will convert XML record from server via XSLT. It is important
      that the content from server is XML. If used in conjunction with
@@ -843,7 +862,6 @@
    <screen><![CDATA[
 <?xml version="1.0"?>
 <!-- XML Schema for YAZ proxy config file.
-    $Id: reference.xml,v 1.20 2006-06-14 10:12:26 adam Exp $
 -->
 <xs:schema
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
@@ -963,6 +981,7 @@
    <xs:attribute name="backendcharset" type="xs:string" />
    <xs:attribute name="usemarconstage1" type="xs:string" />
    <xs:attribute name="usemarconstage2" type="xs:string" />
+   <xs:attribute name="backendelementset" type="xs:string" />
   </xs:complexType>
  </xs:element>