X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;ds=sidebyside;f=doc%2Freference.xml;h=1972b860e92227911d83f9813be3531d50dde99d;hb=ad8d3238ac081a5747105eb77c5333236b29ab34;hp=c2ca0dfb052f9f5b9e9ce7d3bef14ce723faeb27;hpb=e751544e4f8f678eafaf851a215033af6a779684;p=yazproxy-moved-to-github.git

diff --git a/doc/reference.xml b/doc/reference.xml
index c2ca0df..1972b86 100644
--- a/doc/reference.xml
+++ b/doc/reference.xml
@@ -3,7 +3,7 @@
   <section id="proxy-operation">
    <title>Operating Environment</title>
    <para>
-    The YAZ proxy is a single program. After startup it spawns 
+    The YAZ proxy is a console program. After startup it spawns 
     a child process (except on Windows or if option -X is given). 
     The child process is the core of the proxy and it handles all
     communication with clients and servers. The parent process
@@ -406,7 +406,7 @@
      A target that supports use attributes 1,4, 1000 through 1003 and
      no other use attributes, could use the following rules:
      <screen>
-      &lt;attribute type="1" value="1,4,1000-1003">
+      &lt;attribute type="1" value="1,4,1000-1003"/>
       &lt;attribute type="1" value="*" error="114"/>
      </screen>
     </para>
@@ -468,15 +468,15 @@
        ..
        &lt;syntax type="usmarc"/>
        &lt;syntax type="xml" marcxml="1"
-        identifier="info:srw/schema/1/marcxml-v1.1"
-        &lt;title>MARCXML&lt;title>
-        &lt;name>marcxml&lt;name>
-       &lt;syntax>
+         identifier="info:srw/schema/1/marcxml-v1.1"
+         &lt;title>MARCXML&lt;title>
+         &lt;name>marcxml&lt;name>
+       &lt;/syntax>
        &lt;syntax type="xml" marcxml="1" stylesheet="MARC21slim2SRWDC.xsl"
-        identifier="info:srw/schema/1/dc-v1.1">
-        &lt;title>Dublin Core&lt;title>
-        &lt;name>dc&lt;name>
-       &lt;syntax>
+         identifier="info:srw/schema/1/dc-v1.1">
+         &lt;title>Dublin Core&lt;title>
+         &lt;name>dc&lt;name>
+       &lt;/syntax>
        &lt;syntax type="*" error="238"/>
        ..
        &lt;/target>
@@ -515,8 +515,9 @@
    <section id="proxy-config-cql2rpn">
     <title>cql2rpn</title>
     <para>
-     The CDATA of <literal>cql2rpn</literal> refers to CQL to a RPN conversion
-     file - for the server in the target section. This element
+     The content of the <literal>cql2rpn</literal> element specifies
+     the path from the working directory to CQL-to-RPN conversion
+     file for the server in the target section. This element
      is required for SRW/SRU searches to operate against a Z39.50
      server that doesn't support CQL. Most Z39.50 servers only support
      Type-1/RPN so this is usually required.
@@ -525,7 +526,7 @@
       to PQF</ulink> conversion. See also the
      <filename>pqf.properties</filename> in the <filename>etc</filename> 
      (or <replaceable>prefix/share/yazproxy</replaceable>)
-     directory of the YAZ proxy.
+     directory of the YAZ proxy distribution.
     </para>
    </section>
    
@@ -686,9 +687,9 @@
     directory <filename>etc</filename> of the distribution.
    </para>
    <screen><![CDATA[
-    <?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- XML Schema for YAZ proxy config file.
-    $Id: reference.xml,v 1.5 2004-04-21 13:08:21 adam Exp $
+    $Id: reference.xml,v 1.8 2004-07-06 10:44:01 mike Exp $
 -->
 <xs:schema
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
@@ -719,7 +720,7 @@
      <xs:element ref="attribute" minOccurs="0" maxOccurs="unbounded"/>
      <xs:element ref="syntax" minOccurs="0" maxOccurs="unbounded"/>
      <xs:element ref="preinit" minOccurs="0"/>
-     <xs:element name="exp:explain" minOccurs="0"/>
+     <xs:element ref="exp:explain" minOccurs="0"/>
      <xs:element ref="cql2rpn" minOccurs="0"/>
    </xs:sequence>
    <xs:attribute name="default" type="xs:string" use="optional"/>
@@ -765,23 +766,24 @@
  <xs:element name="syntax">
   <xs:complexType>
    <xs:sequence>
-    <xs:element name="title" type="xs:string" minOccurs="0"/>
-    <xs:element name="name" type="xs:string" minOccurs="0"
-                                             maxOccurs="unbounded"/>
+    <xs:element ref="title" minOccurs="0"/>
+    <xs:element ref="name" minOccurs="0" maxOccurs="unbounded"/>
    </xs:sequence>
-   <xs:attribute name="error" type="xs:string" minOccurs="0"/>
-   <xs:attribute name="type" type="xs:string" minOccurs="0"/>
-   <xs:attribute name="marcxml" type="xs:string" minOccurs="0"/>
-   <xs:attribute name="identifier" type="xs:string" minOccurs="0"/>
-   <xs:attribute name="stylesheet" type="xs:string" minOccurs="0"/>
+   <xs:attribute name="error" type="xs:string" />
+   <xs:attribute name="type" type="xs:string" />
+   <xs:attribute name="marcxml" type="xs:string" />
+   <xs:attribute name="identifier" type="xs:string" />
+   <xs:attribute name="stylesheet" type="xs:string" />
   </xs:complexType>
  </xs:element>
 
+ <xs:element name="title" type="xs:string"/>
+ <xs:element name="name" type="xs:string"/>
+
  <xs:element name="max-clients" type="xs:integer"/>
  <xs:element name="log" type="xs:string"/>
 
 </xs:schema>
-
 ]]>
    </screen>
   </section>