diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-08-16 20:38:11 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-08-16 20:38:11 +0000 |
| commit | f738b155b1186c2c77bb23eea9aaffa3fe77a2c6 (patch) | |
| tree | ec0dd6e754385168990c6955e02a780b49b36240 /doc | |
| parent | c0f93e11ff3b8e3160bfcd256ca5164931110b8f (diff) | |
| download | ikiwiki-f738b155b1186c2c77bb23eea9aaffa3fe77a2c6.tar ikiwiki-f738b155b1186c2c77bb23eea9aaffa3fe77a2c6.tar.gz | |
* 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.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/BSD | 20 | ||||
| -rw-r--r-- | doc/freesoftware.mdwn | 3 |
2 files changed, 23 insertions, 0 deletions
diff --git a/doc/BSD b/doc/BSD new file mode 100644 index 000000000..1ba5f1188 --- /dev/null +++ b/doc/BSD @@ -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. diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn index 5d231de58..38a191853 100644 --- a/doc/freesoftware.mdwn +++ b/doc/freesoftware.mdwn @@ -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. |