X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=doc%2Fyaz-man.xml;h=c21900a69409acecb305438e0b855d473c72d491;hp=093493d8cf31b3ad152463bff797700ba52ba8a3;hb=a85807bde8a4a08706d266bd7dd089fb6778e281;hpb=c3db1e5bdc42eb3ba6c50d18b200e7c816ee6e9e

diff --git a/doc/yaz-man.xml b/doc/yaz-man.xml
index 093493d..c21900a 100644
--- a/doc/yaz-man.xml
+++ b/doc/yaz-man.xml
@@ -1,14 +1,24 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" 
- "http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd"
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.4//EN" 
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
 [
-     <!ENTITY % common  SYSTEM "common/common.ent">
-     %common;
+     <!ENTITY % local SYSTEM "local.ent">
+     %local;
+     <!ENTITY % entities SYSTEM "entities.ent">
+     %entities;
+     <!ENTITY % idcommon SYSTEM "common/common.ent">
+     %idcommon;
 ]>
-<!-- $Id: yaz-man.xml,v 1.8 2006-05-24 12:33:21 adam Exp $ -->
 <refentry id="yaz">
+ <refentryinfo>
+  <productname>YAZ</productname>
+  <productnumber>&version;</productnumber>
+  <info><orgname>Index Data</orgname></info>
+ </refentryinfo>
+ 
  <refmeta>
   <refentrytitle>yaz</refentrytitle>
   <manvolnum>7</manvolnum>
+  <refmiscinfo class="manual">Conventions and miscellaneous</refmiscinfo>
  </refmeta>
  
  <refnamediv>
@@ -16,17 +26,11 @@
   <refpurpose>Z39.50 toolkit.</refpurpose>
  </refnamediv>
  
- <refsynopsisdiv>
-  <cmdsynopsis>
-   <command>YAZ</command>
-  </cmdsynopsis>
- </refsynopsisdiv>
- 
  <refsect1><title>DESCRIPTION</title>
   <para>
    YAZ is a C/C++ programmer's toolkit supporting the development
    of Z39.50v3 clients and servers. The YAZ toolkit offers
-   several different levels of access to the ISO23950/Z39.50, SRW/SRU
+   several different levels of access to the ISO23950/Z39.50, SRU
    and ILL protocols. The level that you need to use depends
    on your requirements, and the role (server of client) that you want
    to implement.
@@ -35,35 +39,54 @@
 
  <refsect1><title>COPYRIGHT</title>
   <para>
-   Copyright (c) 1995-2006, Index Data.
+   Copyright &copy; &copyright-year; Index Data.
   </para>
   <para>
-   Permission to use, copy, modify, distribute, and sell this software and
-   its documentation, in whole or in part, for any purpose, is hereby granted,
-   provided that:
-  </para>
-  <para>
-   1. This copyright and permission notice appear in all copies of the
-   software and its documentation. Notices of copyright or attribution
-   which appear at the beginning of any file must remain unchanged.
+   All rights reserved.
   </para>
+  
   <para>
-   2. The names of Index Data or the individual authors may not be used to
-   endorse or promote products derived from this software without specific
-   prior written permission.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
   </para>
   
+  <itemizedlist>
+   <listitem>
+    <para>
+     Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Neither the name of Index Data nor the names of its contributors
+     may be used to endorse or promote products derived from this
+     software without specific prior written permission.
+    </para>
+   </listitem>
+  </itemizedlist>
+  
   <para>
-   THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
-   EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
-   WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-   IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
-   INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
-   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
-   NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
-   LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-   OF THIS SOFTWARE.
+   THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+   EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+   DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR
+   ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+   CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+   SUCH DAMAGE.
   </para>
+  
  </refsect1>
  
  <refsect1><title>SEE ALSO</title>
@@ -84,9 +107,13 @@
      <refentrytitle>zoomsh</refentrytitle>
      <manvolnum>1</manvolnum>
     </citerefentry>
+    <citerefentry>
+     <refentrytitle>bib1-attr</refentrytitle>
+     <manvolnum>7</manvolnum>
+    </citerefentry>
   </para>
   <para>YAZ manual (
-   <filename><replaceable>prefix</replaceable>/share/doc/yaz</filename>)
+   <filename>&prefix;/share/doc/yaz</filename>)
   </para>
   <para>
    <ulink url="&url.yaz;">YAZ home page</ulink>.