X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=doc%2Flicense.xml;h=9c28216c776a4abae5cf561cc3e5172bcee2abb2;hb=688b83880520e7485087b56cc1dda29019d7413f;hp=fefc9a394045ba6ba9e295e123a5cda8b376d95e;hpb=2a6ced8bd8ce528ca91107d862b544737a467f78;p=yazpp-moved-to-github.git

diff --git a/doc/license.xml b/doc/license.xml
index fefc9a3..9c28216 100644
--- a/doc/license.xml
+++ b/doc/license.xml
@@ -1,42 +1,55 @@
-<!-- $Id: license.xml,v 1.6 2006-03-29 13:19:41 adam Exp $ -->
+<!-- $Id: license.xml,v 1.10 2006-10-10 13:46:18 adam Exp $ -->
  <appendix id="license"><title>License</title>
   
-  <section id="yaz.license"><title>YAZ License</title>
-   
-   <para>
-    Copyright &copy; 1999-2006 Index Data Aps and Mike Taylor.
-   </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.
-   </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.
-   </para>
-   
-   <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.
-   </para>
-  </section>
+  <para>
+   Copyright &copy; 1999-2006, Index Data and Mike Taylor.
+  </para>
+  <para>
+   All rights reserved.
+  </para>
+  
+  <para>
+   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 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>
+  
  </appendix>
  
  <!-- Keep this comment at the end of the file