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 +

License for fish

+ +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. - - -

GNU GENERAL PUBLIC LICENSE

@@ -480,6 +463,18 @@ without express or implied warranty.


+

License for xdgmime and glibc

+ +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. + +

GNU LESSER GENERAL PUBLIC LICENSE