X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=doc%2Fyaz-man.xml;h=82172f6c20d8369d265de1db34ebead68a118d96;hp=bd19ead875f94976a72bca0c2ff98c2932ffe1f5;hb=612588b7ff622528fa70ba982ae6ffd82ab30aa2;hpb=f0fff840ae259cab0b1c17297c4367172a7cd229

diff --git a/doc/yaz-man.xml b/doc/yaz-man.xml
index bd19ead..82172f6 100644
--- a/doc/yaz-man.xml
+++ b/doc/yaz-man.xml
@@ -1,142 +1,94 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" 
-    "http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd" [
-<!ENTITY % common SYSTEM "common/common.ent">
-<!-- $Id: yaz-man.xml,v 1.6 2006-04-24 12:41:00 marc Exp $ --><!-- Index Data software --><!ENTITY url.indexdata "http://www.indexdata.com/">
-<!ENTITY url.yaz "http://www.indexdata.com/yaz/">
-<!ENTITY url.yaz.download "http://ftp.indexdata.com/pub/yaz/">
-<!ENTITY url.yaz.download.win32 "http://ftp.indexdata.com/pub/yaz/win32/">
-<!ENTITY url.yaz.mailinglist "http://lists.indexdata.dk/cgi-bin/mailman/listinfo/yazlist">
-<!ENTITY url.yaz.mail "mailto:yaz-help@indexdata.dk">
-<!ENTITY url.yazplusplus "http://www.indexdata.com/yazplusplus/">
-<!ENTITY url.yazproxy "http://www.indexdata.com/yazproxy/">
-<!ENTITY url.idzebra "http://www.indexdata.com/zebra/">
-<!ENTITY url.idzebra.mailinglist "http://lists.indexdata.dk/cgi-bin/mailman/listinfo/zebralist">
-<!ENTITY url.metaproxy "http://www.indexdata.com/metaproxy/">
-<!-- Specifications and Standards --><!ENTITY url.w3c "http://www.w3.org/">
-<!ENTITY url.xml "http://www.w3.org/XML/">
-<!ENTITY url.sru "http://www.loc.gov/standards/sru/">
-<!ENTITY url.sru.diagnostics "http://www.loc.gov/standards/sru/diagnostics.html">
-<!ENTITY url.sru.diagnostics.list "http://www.loc.gov/standards/sru/diagnostics-list.html">
-<!ENTITY url.srw "http://www.loc.gov/standards/sru/srw/">
-<!ENTITY url.soap "http://www.w3.org/TR/soap/">
-<!ENTITY url.z39.50 "http://www.loc.gov/z3950/agency/">
-<!ENTITY url.z39.50.doc "http://www.loc.gov/z3950/agency/markup/toc.html">
-<!ENTITY url.z39.50.asn.1 "http://www.loc.gov/z3950/agency/asn1.html">
-<!ENTITY url.z39.50.diagnostics "http://www.loc.gov/z3950/agency/defns/bib1diag.html">
-<!ENTITY url.z39.50.attset.bib1 "http://www.loc.gov/z3950/agency/defns/bib1.html">
-<!ENTITY url.z39.50.charneg "http://www.loc.gov/z3950/agency/defns/charneg-3.html">
-<!ENTITY url.z39.50.proximity "http://www.loc.gov/z3950/agency/markup/09.html#3.7.2">
-<!ENTITY url.z39.50.proximity.asn1 "http://www.loc.gov/z3950/agency/asn1.html#ProximityOperator">
-<!ENTITY url.z39.50.oids "http://www.loc.gov/z3950/agency/defns/oids.html">
-<!ENTITY url.asn.1.tutorial "http://asn1.elibel.tm.fr/en/introduction/">
-<!ENTITY url.asn.1.standards "http://asn1.elibel.tm.fr/en/standards/">
-<!ENTITY url.cql "http://www.loc.gov/standards/sru/cql/">
-<!ENTITY url.cql.intro "http://zing.z3950.org/cql/intro.html">
-<!ENTITY url.xcql "http://www.loc.gov/standards/sru/xml-files/srw-types.xsd">
-<!ENTITY url.zoom "http://zoom.z3950.org/">
-<!ENTITY url.marc21 "http://www.loc.gov/marc/">
-<!ENTITY url.marc8 "http://www.loc.gov/marc/specifications/speccharmarc8.html">
-<!ENTITY url.marcxml "http://www.loc.gov/standards/marcxml/">
-<!ENTITY url.ill "http://www.nlc-bnc.ca/iso/ill/">
-<!ENTITY url.ber.over.tcpip "http://www.faqs.org/rfcs/rfc1729.html">
-<!ENTITY url.http "http://www.w3.org/Protocols/">
-<!ENTITY url.http.1.1 "http://www.w3.org/Protocols/rfc2616/rfc2616.html">
-<!-- External libraries + tools --><!ENTITY url.apache "http://httpd.apache.org/">
-<!ENTITY url.apache.directive.proxypass "http://httpd.apache.org/docs/mod/mod_proxy.html#proxypass">
-<!ENTITY url.bison "http://www.gnu.org/software/bison/">
-<!ENTITY url.libxml2 "http://xmlsoft.org/">
-<!ENTITY url.libxml2.api "http://www.xmlsoft.org/html/index.html">
-<!ENTITY url.libxml2.api.tree "http://www.xmlsoft.org/html/libxml-tree.html">
-<!ENTITY url.libxslt "http://xmlsoft.org/XSLT/">
-<!ENTITY url.libxml2.download.win32 "http://www.zlatkovic.com/libxml.en.html">
-<!ENTITY url.autoconf "http://www.gnu.org/software/autoconf/">
-<!ENTITY url.automake "http://www.gnu.org/software/automake/">
-<!ENTITY url.libtool "http://www.gnu.org/software/libtool/">
-<!ENTITY url.libiconv "http://www.gnu.org/software/libiconv/">
-<!ENTITY url.tcl "http://www.tcl.tk/">
-<!ENTITY url.perl "http://www.perl.com/">
-<!ENTITY url.gcc "http://gcc.gnu.org/">
-<!ENTITY url.vstudio "http://msdn.microsoft.com/vstudio/">
-<!ENTITY url.boost "http://www.boost.org/">
-<!ENTITY url.boost.compilers.status "http://www.boost.org/status/compiler_status.html">
-<!ENTITY url.openssl "http://www.openssl.org/">
-<!ENTITY url.unxutils "http://unxutils.sourceforge.net/">
-<!ENTITY url.tcpwrapper "ftp://ftp.porcupine.org/pub/security/index.html">
-<!-- Operating Systems --><!ENTITY url.linux.kernel "http://www.kernel.org/">
-<!ENTITY url.debian "http://www.debian.org/">
-<!ENTITY url.redhat "http://www.redhat.com/">
-<!ENTITY url.gentoo "http://www.gentoo.org/">
-<!ENTITY url.freebsd "http://www.freebsd.org/">
-<!ENTITY url.macosx "http://www.apple.com/macosx/">
-<!ENTITY url.solaris "http://www.sun.com/software/solaris/">
-<!ENTITY url.windows2000 "http://www.microsoft.com/windows2000/">
-<!ENTITY url.windows2003server "http://www.microsoft.com/windowsserver2003/default.mspx">
-<!ENTITY url.netbsd "http://www.netbsd.org/">
-<!ENTITY url.openbsd "http://www.openbsd.org/">
-<!ENTITY url.ubunto "http://www.ubuntu.com/">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
+[
+     <!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.6 2006-04-24 12:41:00 marc 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>
-  <refname>YAZ</refname>
+  <refname>yaz</refname>
   <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
-   and ILL protocols. The level that you need to use depends
-   on your requirements, and the role (server of client) that you want
+   several different levels of access to the ISO23950/Z39.50, SRU
+   Solr (client only) and ILL protocols. The level that you need to use depends
+   on your requirements, and the role (server or client) that you want
    to implement.
   </para>
  </refsect1>
 
  <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>
   <para>
     <citerefentry>
@@ -155,20 +107,34 @@
      <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>/usr/share/doc/yaz</filename>)
   </para>
   <para>
-   <ulink url="http://www.indexdata.com/yaz/">YAZ home page</ulink>.
+   <ulink url="&url.yaz;">YAZ home page</ulink>.
   </para>
   <para>
-   <ulink url="http://www.loc.gov/z3950/agency/">Z39.50 Maintenance Agency Page</ulink>.
+   <ulink url="&url.z39.50;">Z39.50 Maintenance Agency Page</ulink>.
   </para>
  </refsect1>
 </refentry>
-<!-- Keep this Emacs mode comment at the end of the file
+
+<!-- Keep this comment at the end of the file
 Local variables:
-mode: nxml
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-local-catalogs: nil
+sgml-namecase-general:t
 End:
 -->