X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=doc%2Flicense.xml;h=ad1d208681d9296b45e77d7934f0c477787ac852;hp=a9202529920438e633f81b5dba3fc3186d1b591f;hb=964580242e2e0b2e570f652afa58bfb90ad0bb5e;hpb=be6bf53019f49c1448f0161e3b0ce8d3b5b09ec0

diff --git a/doc/license.xml b/doc/license.xml
index a920252..ad1d208 100644
--- a/doc/license.xml
+++ b/doc/license.xml
@@ -1,40 +1,55 @@
-<!-- $Id: license.xml,v 1.12 2006-04-25 11:25:08 marc Exp $ -->
+<!-- $Id: license.xml,v 1.13 2006-10-09 21:02:40 adam Exp $ -->
  <appendix id="license"><title>License</title>
 
   <sect1 id="license.indexdata"><title>Index Data Copyright</title>
 
    <para>
-    Copyright &copy; &copyright-year; Index Data ApS.
+    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>
   </sect1>
   <sect1 id="license.other"><title>Additional Copyright Statements</title>