From eb8857cfa2ceaa2635f14888b95d6f71b8def045 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 5 Mar 2003 00:08:04 +0000
Subject: [PATCH] WIN32/Unix installation sections

---
 doc/Makefile.am      |   13 +++++++------
 doc/installation.xml |   40 ++++++++++++++++++++++++----------------
 index/extract.c      |    4 ++--
 index/zebraapi.c     |    4 ++--
 4 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index ae269af..a47d8ec 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.18 2002-11-08 13:23:52 adam Exp $
+## $Id: Makefile.am,v 1.19 2003-03-05 00:08:04 adam Exp $
 docdir=$(datadir)/doc/@PACKAGE@
 
 SUPPORTFILES = \
@@ -21,13 +21,14 @@ XMLFILES = \
  indexdata.xml \
  zebraidx-options.xml
 
-HTMLFILES = administration.html apps.html configuration-file.html \
- data-model.html example1.html example2.html examples.html features.html \
- file-ids.html formats.html future.html generic-ids.html indexdata.html \
- installation.html internal-representation.html introduction.html \
+HTMLFILES =  \
+ administration.html apps.html configuration-file.html data-model.html \
+ example1.html example2.html examples.html features.html file-ids.html \
+ formats.html future.html generic-ids.html indexdata.html installation.html \
+ installation.win32.html internal-representation.html introduction.html \
  license.html locating-records.html protocol-support.html quick-start.html \
  record-model.html register-location.html server.html shadow-registers.html \
- simple-indexing.html support.html zebra.html zebraidx.html
+ simple-indexing.html support.html zebra.html zebraidx.html 
 
 doc_DATA = $(HTMLFILES) zebra.pdf
 man_MANS = zebraidx.1 zebrasrv.8
diff --git a/doc/installation.xml b/doc/installation.xml
index 021a610..f10b0ea 100644
--- a/doc/installation.xml
+++ b/doc/installation.xml
@@ -1,20 +1,28 @@
-<!-- $Id: installation.xml,v 1.7 2003-03-04 23:30:20 adam Exp $ -->
+<!-- $Id: installation.xml,v 1.8 2003-03-05 00:08:04 adam Exp $ -->
  <chapter id="installation">
   <title>Installation</title>
   <para>
-   Zebra is very portable. An ANSI C compiler is required. We
-   primarily use GNU C on UNIX and Microsoft Visual C++ on Windows.
+   Zebra is written in ANSI C and was implemented with portability in mind. 
+   We primarily use GNU C on UNIX and Microsoft Visual C++ on Windows.
   </para>
 
   <para>
-   Zebra uses following components. Most of these are optional.
+   The software is regularly tested on Debian GNU/Linux, Redhat Linux,
+   Gentoo Linux, NetBSD (Cobalt), FreeBSD (i386), SunOS 5.8 (sparc),
+   Windows 2000 SP3.
+  </para>
+  
+  <para>
+   Zebra can be configured to use the following utilities (most of
+   which are optional):
+
    <variablelist>
     <varlistentry>
      <term><ulink url="http://www.indexdata.dk/yaz/">yaz</ulink> (required)</term>
      <listitem>
       <para>
-       Zebra uses lots of utilities provided by YAZ. Most notably
-       Z39.50 support.
+       Zebra uses YAZ to support Z39.50/SRW. Also the memory management
+       utilites from YAZ is used by Zebra.
       </para>
      </listitem>
     </varlistentry>
@@ -35,12 +43,12 @@
      <listitem>
       <para>
        XML parser. If you're going to index real XML you should
-       install this (filter grs.xml). On most system, you should be able
+       install this (filter grs.xml). On most systems you should be able
        to find binary Expat packages.
       </para>
      </listitem>
     </varlistentry>
-
+    
     <varlistentry>
      <term><ulink url="http://www.perl.com/">Perl</ulink> (optional)</term>
      <listitem>
@@ -52,7 +60,7 @@
       </para>
      </listitem>
     </varlistentry>
-
+    
     <varlistentry>
      <term><ulink url="http://www.tcl.tk/">Tcl</ulink> (optional)</term>
      <listitem>
@@ -63,13 +71,12 @@
       </para>
      </listitem>
     </varlistentry>
-
+    
     <varlistentry>
      <term>
       <ulink url="http://www.gnu.org/software/autoconf/">Autoconf</ulink>,
-      <ulink url="
-      
- (optional)</term>
+      <ulink url="http://www.gnu.org/software/automake/">Automake</ulink>
+      (optional)</term>
      <listitem>
       <para>
        GNU Automake and Autoconf are only required if you're
@@ -80,7 +87,8 @@
     </varlistentry>
     
     <varlistentry>
-     <term>Docbook and friends (optional)</term>
+     <term><ulink url="http://docbook.org/">Docbook</ulink>
+      and friends (optional)</term>
      <listitem>
       <para>
        These tools are only required if you're writing
@@ -183,9 +191,9 @@
     to configure.
    </para>
   </sect1>
-  <sect1><title>WIN32</title>
+  <sect1 id="installation.win32"><title>WIN32</title>
    <para>
-    
+    [to be written]
    </para>
   </sect1>
  </chapter>
diff --git a/index/extract.c b/index/extract.c
index 0dc5773..a54bb10 100644
--- a/index/extract.c
+++ b/index/extract.c
@@ -1,5 +1,5 @@
-/* $Id: extract.c,v 1.140 2003-03-04 23:30:20 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: extract.c,v 1.141 2003-03-05 00:08:04 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
    Index Data Aps
 
 This file is part of the Zebra server.
diff --git a/index/zebraapi.c b/index/zebraapi.c
index f71682c..74fa36c 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,5 +1,5 @@
-/* $Id: zebraapi.c,v 1.89 2003-03-04 23:48:55 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: zebraapi.c,v 1.90 2003-03-05 00:08:04 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
    Index Data Aps
 
 This file is part of the Zebra server.
-- 
1.7.10.4