Fix broken xml entity.

[idzebra-moved-to-github.git] / doc / installation.xml

diff --git a/doc/installation.xml b/doc/installation.xml
index 81ac880..bdaebc4 100644 (file)
--- a/doc/installation.xml
+++ b/doc/installation.xml
@@ -10,13 +10,9 @@
    The software is regularly tested on
    <ulink url="&url.debian;">Debian GNU/Linux</ulink>,
    <ulink url="&url.redhat;">Red Hat Linux</ulink>,
-   <ulink url="&url.gentoo;">Gentoo Linux</ulink>,
-   <ulink url="&url.suse;">SuSE Linux</ulink>,
    <ulink url="&url.freebsd;">FreeBSD (i386)</ulink>,
    <ulink url="&url.macosx;">MAC OSX</ulink>,
-   <ulink url="&url.solaris;">SunOS 5.9
-    (sparc)</ulink>,
-   <ulink url="&url.windows2000;">Windows 2000</ulink>.
+   Windows 7.
   </para>
 
   <para>
@@ -224,26 +220,17 @@
 
   <section id="installation-debian"><title>GNU/Debian</title>
    <section id="installation-debian-linux"><title>GNU/Debian Linux on
-     i686 Platform</title>
+     amd64/i386 Platform</title>
     <para>
-     Index Data provides pre-compiled GNU/Debian i686 Linux packages
-     at our Debian package archive, both for
-     the Sarge and the Etch release.
+     Index Data provides pre-compiled GNU/Debian and Ubuntu packages
+     at our Debian package archive, both for recent releases.
     </para>
 
     <para>
-     To install these packages, you need to add two lines to your
-     <filename>/etc/apt/sources.list</filename> configuration file,
-     either the Sarge sources found at
-     <screen>
-      deb http://ftp.indexdata.dk/debian sarge main
-      deb-src http://ftp.indexdata.dk/debian sarge main
-     </screen>
-     or the Etch sources from
-     <screen>
-      deb http://ftp.indexdata.dk/debian etch main
-      deb-src http://ftp.indexdata.dk/debian etch main
-     </screen>
+     For Debian, refer to 
+     <ulink url="http://ftp.indexdata.dk/pub/zebra/debian/README"/>
+     for how to configure APT. For Ubuntu, refer to
+     <ulink url="http://ftp.indexdata.dk/pub/zebra/ubuntu/README"/>.
      After refreshing the package cache with the command
      <screen>
       apt-get update
@@ -258,23 +245,15 @@
    </section>
 
    <section id="installation-debia-nother">
-    <title>Ubuntu/Debian and GNU/Debian on other platforms</title>
+    <title>GNU/Debian and Ubuntu on other architectures</title>
     <para>
      These <ulink url="&url.idzebra;">&zebra;</ulink>
      packages are specifically compiled for
-     GNU/Debian Linux systems. Installation on other
+     GNU/Debian Linux systems and Ubuntu. Installation on other
      GNU/Debian systems is possible by
      re-compilation the Debian way: you need to add only the
      <literal>deb-src</literal> sources lines to the
      <filename>/etc/apt/sources.list</filename> configuration file,
-     that is either the Sarge sources
-     <screen>
-      deb-src http://ftp.indexdata.dk/debian sarge main
-     </screen>
-     or the Etch sources
-     <screen>
-      deb-src http://ftp.indexdata.dk/debian etch main
-     </screen>
      After refreshing the package cache with the command
      <screen>
       apt-get update
@@ -296,7 +275,7 @@
    </section>
   </section>
 
-  <section id="installation-win32"><title>WIN32</title>
+  <section id="installation-win32"><title>Windows</title>
    <para>The easiest way to install &zebra; on Windows is by downloading
     an installer from
     <ulink url="&url.idzebra.download.win32;">here</ulink>.
@@ -307,8 +286,7 @@
    <para>
     &zebra; is shipped with "makefiles" for the NMAKE tool that comes
     with <ulink url="&url.vstudio;">Microsoft Visual C++</ulink>.
-    Version 2003 and 2005 has been tested. We expect that zebra compiles
-    with version 6 as well.
+    Version 2013 has been tested.
    </para>
    <para>
     Start a command prompt and switch the sub directory
@@ -333,7 +311,7 @@
       <term><literal>YAZDIR</literal></term>
       <listitem><para>
         Directory of &yaz; source. &zebra;'s makefile expects to find
-        <filename>yaz.lib</filename>, <filename>yaz.dll</filename>
+        YAZ<filename>.lib</filename>, YAZ<filename>.dll</filename>
         in <replaceable>yazdir</replaceable><literal>/lib</literal> and
         <replaceable>yazdir</replaceable><literal>/bin</literal> respectively.
        </para>
@@ -354,19 +332,6 @@
      </varlistentry>
 
      <varlistentry>
-      <term><literal>HAVE_ICONV</literal>,
-       <literal>ICONV_DIR</literal></term>
-      <listitem><para>
-        If <literal>HAVE_ICONV</literal> is set to 1, &zebra; is compiled
-        with iconv support. In this configuration, set
-        <literal>ICONV_DIR</literal> to the iconv source directory.
-        Iconv binaries can be downloaded from
-        <ulink url="&url.libxml2.download.win32;">this site</ulink>.
-       </para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry>
       <term><literal>BZIP2INCLUDE</literal>,
        <literal>BZIP2LIB</literal>,
        <literal>BZIP2DEF</literal>