From d5320fb9f931a338cf19d5fb0e205ff8e0ac90b8 Mon Sep 17 00:00:00 2001
From: axel <axel@liljencrantz.se>
Date: Mon, 23 Feb 2009 08:45:40 +1000
Subject: [PATCH] Update copyright info, minor layout changes to section about
 licenses in fish

darcs-hash:20090222224540-ac50b-69c4f8dd027e4672b8d25f8240c1d5f625135ad1.gz
---
 doc_src/license.hdr | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/doc_src/license.hdr b/doc_src/license.hdr
index 5e433a01d..5a5654c23 100644
--- a/doc_src/license.hdr
+++ b/doc_src/license.hdr
@@ -1,28 +1,11 @@
 /** \page license Licenses
 
-Fish Copyright (C) 2005-2006 Axel Liljencrantz. Fish is released under
+<h2>License for fish</h2>
+
+Fish Copyright (C) 2005-2009 Axel Liljencrantz. Fish is released under
 the GNU General Public License, version 2. The license agreement is
 included below.
 
-Fish contains code under the BSD license, namely versions of the
-two functions strlcat and strlcpy, modified for use with wide
-character strings. This code is copyrighted by Todd C. Miller. The
-license agreement is included below.
-
-The XSel command, written and copyrighted by Conrad Parker, is
-distributed together with, and used by fish. It is released under the MIT
-license. The license agreement is included below.
-
-The xdgmime library, written and copyrighted by Red Hat, Inc, is used
-by the mimedb command, which is a part of fish. It is released under
-the LGPL. The license agreement is included below.
-
-Fish contains code from the glibc library, namely the wcstok
-function. This code is licensed under the LGPL. The license agreement
-is included below.
-
-
-<HR>
 
 <H2><A NAME="SEC1" HREF="gpl.html#TOC1">GNU GENERAL PUBLIC LICENSE</A></H2>
 <P>
@@ -480,6 +463,18 @@ without express or implied warranty.
 
 <HR>
 
+<h2>License for xdgmime and glibc</h2>
+
+The xdgmime library, written and copyrighted by Red Hat, Inc, is used
+by the mimedb command, which is a part of fish. It is released under
+the LGPL, version 2 or later, or under the Academic Free License,
+version 2. Version 2 of the LGPL license agreement is included below.
+
+Fish contains code from the glibc library, namely the wcstok
+function. This code is licensed under the LGPL, version 2 or
+later. Version 2 of the LPGL license agreement is included below.
+
+
 <H2><A NAME="SEC1" HREF="#TOC1">GNU LESSER GENERAL PUBLIC LICENSE</A></H2>
 
 <P>