X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=doc%2Fzoom.xml;h=e61a14e47a166dda0b8e410c44778ec37408a00a;hb=1b6019ff065a98af709be905adc6c08094471d57;hp=0460599db207d9999bea999151519fd00b6e8f0c;hpb=0604512365d9d3c223e147e416129589dabc31d4;p=yazpp-moved-to-github.git

diff --git a/doc/zoom.xml b/doc/zoom.xml
index 0460599..e61a14e 100644
--- a/doc/zoom.xml
+++ b/doc/zoom.xml
@@ -1,5 +1,5 @@
 <chapter id="zoom">
- <!-- $Id: zoom.xml,v 1.8 2002-10-21 13:38:21 adam Exp $ -->
+ <!-- $Id: zoom.xml,v 1.12 2004-04-11 11:16:39 adam Exp $ -->
  <title>ZOOM-C++</title>
 
 
@@ -17,14 +17,14 @@
    programming languages.
   </para>
   <para>
-   The Yaz++ library includes an implementation of the <ulink
+   The YAZ++ library includes an implementation of the <ulink
    url="http://zoom.z3950.org/bind/cplusplus/"
 	>C++ binding</ulink>
    for ZOOM, enabling quick, easy development of client applications.
   </para>
   <para>
    For example, here is a tiny Z39.50 client that fetches and displays
-   the MARC record for Farlow & Brett Surman's
+   the MARC record for Farlow &amp; Brett Surman's
    <citetitle>The Complete Dinosaur</citetitle>
    from the Library of Congress's Z39.50 server:
   </para>
@@ -44,17 +44,19 @@
         cout &lt;&lt; rec-&gt;render() &lt;&lt; endl;
     }
   </programlisting>
+   <note>
+    <para>
+     For the sake of simplicity, this program does not check
+     for errors: we show a more robust version of the same program
+     <link linkend="revised-sample">later</link>.)
+    </para>
+   </note>
   <para>
-   (Note that, for the sake of simplicity, this program does not check
-   for errors: we show a more robust version of the same program
-   <link linkend="revised-sample">later</link>.)
-  </para>
-  <para>
-   Yaz++'s implementation of the C++ binding is a thin layer over Yaz's
+   YAZ++'s implementation of the C++ binding is a thin layer over YAZ's
    implementation of the C binding.  For information on the supported
    options and other such details, see the ZOOM-C documentation, which
    can be found on-line at
-   <ulink url="http://www.indexdata.dk/yaz/doc/zoom.php"/>
+   <ulink url="http://www.indexdata.dk/yaz/doc/zoom.tkl"/>
   </para>
   <para>
    All of the classes defined by ZOOM-C++ are in the
@@ -155,7 +157,7 @@
     </listitem>
     <listitem>
      <para>
-      <ulink url="http://www.indexdata.dk/yaz/doc/zoom.php#zoom.connections"
+      <ulink url="http://www.indexdata.dk/yaz/doc/zoom.tkl#zoom.connections"
 	>The Connections section of the ZOOM-C documentation</ulink>
      </para>
     </listitem>
@@ -183,9 +185,9 @@
     };
    </synopsis>
    <para>
-    This class enables a query to be created by compiling Yaz's
+    This class enables a query to be created by compiling YAZ's
     cryptic but powerful
-    <ulink url="http://www.indexdata.dk/yaz/doc/tools.php#PQF"
+    <ulink url="http://www.indexdata.dk/yaz/doc/tools.tkl#PQF"
 	>Prefix Query Notation (PQN)</ulink>.
    </para>
   </sect2>
@@ -202,10 +204,10 @@
    <para>
     This class enables a query to be created using the simpler but
     less expressive
-    <ulink url="http://www.indexdata.dk/yaz/doc/tools.php#CCL"
+    <ulink url="http://www.indexdata.dk/yaz/doc/tools.tkl#CCL"
 	>Common Command Language (CCL)</ulink>.
     The qualifiers recognised by the CCL parser are specified in an
-    external configuration file in the format described by the Yaz
+    external configuration file in the format described by the YAZ
     documentation.
    </para>
    <para>
@@ -255,7 +257,7 @@
     </listitem>
     <listitem>
      <para>
-      <ulink url="http://www.indexdata.dk/yaz/doc/zoom.query.php"
+      <ulink url="http://www.indexdata.dk/yaz/doc/zoom.query.tkl"
 	>The Queries section of the ZOOM-C documentation</ulink>
      </para>
     </listitem>
@@ -337,7 +339,7 @@
     </listitem>
     <listitem>
      <para>
-      <ulink url="http://www.indexdata.dk/yaz/doc/zoom.resultsets.php"
+      <ulink url="http://www.indexdata.dk/yaz/doc/zoom.resultsets.tkl"
 	>The Result Sets section of the ZOOM-C documentation</ulink>
      </para>
     </listitem>
@@ -421,7 +423,7 @@
   <sect2>
    <title>Memory Management</title>
    <para>
-    The <literal>record</literal> obejcts returned from
+    The <literal>record</literal> objects returned from
     <literal>resultSet::getRecord()</literal> are ``owned'' by the
     result set object: that means that the application is not
     responsible for <literal>delete</literal>ing them - each
@@ -467,7 +469,7 @@
     </listitem>
     <listitem>
      <para>
-      <ulink url="http://www.indexdata.dk/yaz/doc/zoom.records.php"
+      <ulink url="http://www.indexdata.dk/yaz/doc/zoom.records.tkl"
 	>The Records section of the ZOOM-C documentation</ulink>
      </para>
     </listitem>
@@ -665,7 +667,7 @@
     <literal>exception</literal> class and its subclasses.  The
     closest thing is the <literal>ZOOM_connection_error</literal>
     function described in
-    <ulink url="http://www.indexdata.dk/yaz/doc/zoom.php#zoom.connections"
+    <ulink url="http://www.indexdata.dk/yaz/doc/zoom.tkl#zoom.connections"
 	>The Connections section</ulink> of the documentation.
    </para>
   </sect2>