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

diff --git a/doc/zoom.xml b/doc/zoom.xml
index 0460599..7ae1c3b 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.11 2002-11-08 13:38:45 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,13 +44,15 @@
         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
@@ -183,7 +185,7 @@
     };
    </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"
 	>Prefix Query Notation (PQN)</ulink>.
@@ -205,7 +207,7 @@
     <ulink url="http://www.indexdata.dk/yaz/doc/tools.php#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>