Remove newline in <filename> content and other

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

diff --git a/doc/zebra.xml b/doc/zebra.xml
index 540bbd4..f9bbb5b 100644 (file)
--- a/doc/zebra.xml
+++ b/doc/zebra.xml
@@ -6,12 +6,11 @@
      %local;
      <!ENTITY % entities SYSTEM "entities.ent">
      %entities;
-     <!ENTITY % common SYSTEM "common/common.ent">
-     %common;
+     <!ENTITY % idcommon SYSTEM "common/common.ent">
+     %idcommon;
 
      <!ENTITY test SYSTEM "test.xml">
 ]>
-<!-- $Id: zebra.xml,v 1.17 2007-02-20 14:28:31 marc Exp $ -->
 <book id="zebra">
  <bookinfo>
   <title>&zebra; - User's Guide and Reference</title>
@@ -24,23 +23,23 @@
   </authorgroup>
   <releaseinfo>&version;</releaseinfo>
   <copyright>
-   <year>1995-2007</year>
+   <year>&copyright-year;</year>
    <holder>Index Data</holder>
   </copyright>
   <abstract>
    <simpara>
     &zebra; is a free, fast, friendly information management system.  It
-    can index records in &xml;, &sgml;, &marc;, e-mail archives and many
+    can index records in &acro.xml;, &acro.sgml;, &acro.marc;, e-mail archives and many
     other formats, and quickly find them using a combination of
     boolean searching and relevance ranking.  Search-and-retrieve
-    applications can be written using &api;s in a wide variety of
+    applications can be written using &acro.api;s in a wide variety of
     languages, communicating with the &zebra; server using
     industry-standard information-retrieval protocols or web services.
    </simpara>
    <simpara>
     This manual explains how to build and install &zebra;, configure it
     appropriately for your application, add data and set up a running
-    information service.  It describes version &version; of &zebra;.
+    information service. It describes version &version; of &zebra;.
    </simpara>
    <simpara>
     <inlinemediaobject>
@@ -57,8 +56,9 @@
  
   &chap-introduction;
   &chap-installation;
-  &chap-quickstart;
-  &chap-examples;
+  <!-- &chap-quickstart; -->
+  <!-- &chap-examples; -->
+  &chap-tutorial;
   &chap-architecture;
   &chap-querymodel;
   &chap-administration;
@@ -69,10 +69,17 @@
  
  <reference id="reference">
   <title>Reference</title>
+   <partintro id="reference-introduction">
+    <para>
+     The material in this chapter is drawn directly from the individual
+     manual entries.
+    </para>
+   </partintro>
   &manref;
  </reference>
  
  &app-license;
+ &gpl2;
  &app-indexdata;
  
 </book>