X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=doc%2Flicense.xml;h=998d18ca1a7924b972f4272a9697474142636719;hp=882d0259c5ba0300e4c7a2854dcf8668f5af914d;hb=9b8dda8226cff9fb0ee5bf8d7c0e88e9613df63e;hpb=2f1a9a4b28ae43c9da9e0740f84048065b2d3bf6

diff --git a/doc/license.xml b/doc/license.xml
index 882d025..998d18c 100644
--- a/doc/license.xml
+++ b/doc/license.xml
@@ -1,11 +1,10 @@
-<!-- $Id: license.xml,v 1.1 2004-04-11 11:36:52 adam Exp $ -->
  <appendix id="license"><title>License</title>
   
   <section id="gpl"><title>GPL</title>
    
    <para>
     YAZ Proxy,
-    Copyright &copy; 1999-2004 Index Data ApS.
+    Copyright &copy; &copyright-year; Index Data.
    </para>
    
    <para>
@@ -25,17 +24,16 @@
    <para>
     You should have received a copy of the GNU General Public License
     along with YAZ Proxy; see the file LICENSE.proxy.  If not, write to the
-    Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-    02111-1307, USA.
+    Free Software Foundation,
+    51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    </para>
    
-   <section><title>GNU General Public License</title>
    <screen>
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -311,45 +309,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-    </screen> 
-   </section>
-  </section>
-  
-  <section id="yaz.license"><title>YAZ License</title>
-   
-   <para>
-    Copyright &copy; 1999-2004 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>
+   </screen> 
   </section>
  </appendix>
  
@@ -362,7 +322,7 @@ POSSIBILITY OF SUCH DAMAGES.
  sgml-always-quote-attributes:t
  sgml-indent-step:1
  sgml-indent-data:t
- sgml-parent-document: "yaz++.xml"
+ sgml-parent-document: "yazproxy.xml"
  sgml-local-catalogs: nil
  sgml-namecase-general:t
  End: