* Relicense the templates and basewiki under the 2-clause BSD license.
Since these can easily become part of other people's websites, they should be under as permissive a license as possible.master
parent
c0f93e11ff
commit
f738b155b1
|
@ -1,3 +1,11 @@
|
|||
ikiwiki (1.20) UNRELEASED; urgency=low
|
||||
|
||||
* Relicense the templates and basewiki under the 2-clause BSD license.
|
||||
Since these can easily become part of other people's websites, they
|
||||
should be under as permissive a license as possible.
|
||||
|
||||
-- Joey Hess <joeyh@debian.org> Wed, 16 Aug 2006 16:30:44 -0400
|
||||
|
||||
ikiwiki (1.19) unstable; urgency=low
|
||||
|
||||
* Fix several related bugs in page type determination during online editing.
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
ikiwiki is copyright 2006 by Joey Hess <joey@kitenet.net>. It is licensed
|
||||
under the terms of the GPL version 2 or later.
|
||||
under the terms of the GPL version 2 or later. On Debian systems, the
|
||||
complete text of the GPL can be found in /usr/share/common-licenses/GPL
|
||||
|
||||
The git code and logo are copyright 2006 by Recai Oktaş <roktas@debian.org>
|
||||
under the terms of the GPL version 2 or later.
|
||||
|
@ -9,5 +10,25 @@ The smiley icons were copied from Moin Moin, which has these copyrights:
|
|||
Copyright (C) 1999, 2000 Martin Pool <mbp@humbug.org.au>
|
||||
Moin Moin is licensed under the terms of GPL version 2 or later.
|
||||
|
||||
On Debian systems, the complete text of the GPL can be found in
|
||||
/usr/share/common-licenses/GPL.
|
||||
The basewiki and templates are licensed using a varient of the BSD license:
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions
|
||||
are met:
|
||||
1. Redistributions of source code must retain the above copyright
|
||||
notice, this list of conditions and the following disclaimer.
|
||||
2. 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.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY AUTHORS 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 AUTHORS OR 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.
|
||||
|
|
|
@ -0,0 +1,20 @@
|
|||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions
|
||||
are met:
|
||||
1. Redistributions of source code must retain the above copyright
|
||||
notice, this list of conditions and the following disclaimer.
|
||||
2. 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.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS OR 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.
|
|
@ -1 +1,4 @@
|
|||
ikiwiki is licensed under the terms of the GNU [[GPL]].
|
||||
|
||||
The parts of ikiwiki that become part of your own wiki (the basewiki pages
|
||||
and the [[template]]) are licensed using a form of the [[BSD]] license.
|
||||
|
|
Loading…
Reference in New Issue