Using common entities

diff --git a/doc/installation.xml b/doc/installation.xml
index 25ecb9e..dbd3d46 100644 (file)
--- a/doc/installation.xml
+++ b/doc/installation.xml
@@ -1,17 +1,17 @@
 <chapter id="installation">
-  <!-- $Id: installation.xml,v 1.17 2006-04-25 12:37:05 marc Exp $ -->
+  <!-- $Id: installation.xml,v 1.18 2006-04-27 13:04:39 adam Exp $ -->
   <title>Installation</title>
   <para>
    You need a C++ compiler to compile and use YAZ++.
-   The software was implemented using GCC so we know that works
-   well with YAZ++. From time to time the software has been
-   compiled on Windows using Visual C++. Other compilers should
-   work too. Let us know of portability problems, etc. with
-   your system.
+   The software was implemented using <ulink url="&url.gcc;">GCC</ulink>
+   so we know that works well with YAZ++. From time to time the
+   software is compiled on Windows using Visual C++.
+   Other compilers should work too. Let us know of portability
+   problems, etc. with your system.
   </para>
   <para>
    YAZ++ is built on top of the 
-   <ulink url="http://indexdata.dk/yaz/">YAZ</ulink>
+   <ulink url="&url.yaz;">YAZ</ulink>
    toolkit.
    You need to install that first.
    For some platforms there are binary packages for YAZ.
@@ -138,9 +138,8 @@
    <title>Building on Windows</title>
    <para>
     YAZ++ is shipped with "makefiles" for the NMAKE tool that comes
-    with <ulink url="http://msdn.microsoft.com/vstudio/">
-     Microsoft Visual Studio</ulink>.
-    Version 6 and .NET has been tested. We expect that YAZ++ compiles
+    with <ulink url="&url.vstudio;">Microsoft Visual Studio</ulink>.
+    Version 6 and .NET 2003 has been tested. We expect that YAZ++ compiles
     with version 5 as well.
    </para>
     <para>

diff --git a/doc/introduction.xml b/doc/introduction.xml
index 08fec59..5ec2583 100644 (file)
--- a/doc/introduction.xml
+++ b/doc/introduction.xml
@@ -1,15 +1,14 @@
-<!-- $Id: introduction.xml,v 1.7 2006-04-25 12:37:05 marc Exp $ -->
+<!-- $Id: introduction.xml,v 1.8 2006-04-27 13:04:39 adam Exp $ -->
  <chapter id="introduction"><title>Introduction</title>
   <para>
-   <ulink url="http://www.indexdata.dk/yazplusplus/">YAZ++</ulink> 
-   is a C++ layer for YAZ and implements the ANSI Z39.50
-   protocol for information retrieval (client and server side).
-   While YAZ itself can be used from both C and C++ it is limited by the
-   common denominator C.
+   <ulink url="&url.yazplusplus;">YAZ++</ulink> 
+   is a C++ layer for YAZ and implements the ANSI
+   <ulink url="&url.z39.50;">Z39.50</ulink> protocol for information
+   retrieval (client and server side).
   </para>
   <para>
    The YAZ++ packages also features a ZOOM interface for C++ (
-   <ulink url="http://zoom.z3950.org/bind/cplusplus/">ZOOM C++</ulink>).
+   <ulink url="&url.zoom.bind.cplusplus;">ZOOM C++</ulink>).
   </para>
   <para>
    Later versions (0.7+) of YAZ++ also supports SRW/SRU.

diff --git a/doc/yazpp.xml.in b/doc/yazpp.xml.in
index dffc31c..c1d8df2 100644 (file)
--- a/doc/yazpp.xml.in
+++ b/doc/yazpp.xml.in
@@ -6,8 +6,10 @@
      <!ENTITY chap-zoom SYSTEM "zoom.xml">
      <!ENTITY chap-api SYSTEM "api.xml">
      <!ENTITY app-license SYSTEM "license.xml">
+     <!ENTITY % common  SYSTEM "common/common.ent">
+     %common;
 ]>
-<!-- $Id: yazpp.xml.in,v 1.3 2006-04-24 12:55:16 marc Exp $ -->
+<!-- $Id: yazpp.xml.in,v 1.4 2006-04-27 13:04:39 adam Exp $ -->
 <book id="yazpp">
  <bookinfo>
   <title>YAZ++ User's Guide and Reference</title>
@@ -22,14 +24,16 @@
    <year>2002</year>
    <year>2003</year>
    <year>2004</year>
+   <year>2005</year>
+   <year>2006</year>
    <holder>Index Data Aps and Mike Taylor</holder>
   </copyright>
   <abstract>
    <simpara>
-    <ulink url="http://www.indexdata.dk/yazplusplus/">YAZ++</ulink>
+    <ulink url="&url.yazplusplus;">YAZ++</ulink>
     is a set of libraries and header files that make it easier
     to use the popular C-language
-    <ulink url="http://www.indexdata.dk/yaz/">YAZ toolkit</ulink>
+    <ulink url="&url.yaz;">YAZ toolkit</ulink>
     from C++, together with some utilities written using these
     libraries.  It includes an implementation of the C++ binding for
     ZOOM (<link linkend="zoom">ZOOM-C++</link>).
@@ -38,7 +42,7 @@
     This manual covers version @VERSION@.
     </simpara>
    <simpara>
-    CVS ID: $Id: yazpp.xml.in,v 1.3 2006-04-24 12:55:16 marc Exp $
+    CVS ID: $Id: yazpp.xml.in,v 1.4 2006-04-27 13:04:39 adam Exp $
    </simpara>
    <simpara>
     <inlinemediaobject>