From 262065ef163a417eb96dded78316e67b5c803caf Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 30 Jan 2006 22:48:40 +0100 Subject: language updates darcs-hash:20060130214840-7ad00-ef1974692b64d4e4f7420d5c68f70f113630957b.gz --- data/pages/wiki/dokuwiki.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'data/pages/wiki') diff --git a/data/pages/wiki/dokuwiki.txt b/data/pages/wiki/dokuwiki.txt index d8b107310..6f5566e9a 100644 --- a/data/pages/wiki/dokuwiki.txt +++ b/data/pages/wiki/dokuwiki.txt @@ -43,6 +43,8 @@ All documentation and additional information besides the [[syntax|syntax descrip The DokuWiki engine is licensed under [[http://www.gnu.org/licenses/gpl.html|GNU General Public License]] Version 2. If you use DokuWiki in your company, consider donating a few bucks to me via [[https://www.paypal.com/xclick/business=andi%40splitbrain.org&item_name=DokuWiki+Donation&no_shipping=1&no_note=1&tax=0&currency_code=EUR&lc=US|PayPal]] ;-). -The content published in the DokuWiki at http://www.splitbrain.org/dokuwiki/ is licensed under the [[http://creativecommons.org/licenses/by-nc-sa/2.0/|Creative Commons Attribution-NonCommercial-ShareAlike License]] Version 2.0. This is true for all content (files inside the ''data'' directory) distributed in the download tarball, too. +The content published in the DokuWiki at http://www.splitbrain.org/dokuwiki/ is licensed under the [[http://creativecommons.org/licenses/by-nc-sa/2.0/|Creative Commons Attribution-NonCommercial-ShareAlike License]] Version 2.0. + +An exception is made for the content which distributed in the download tarball ((files inside the ''data'' directory -- eg: ''dokuwiki.txt'', ''syntax.txt'', ''dokuwiki-128.png'')) which is, for compatibility reasons, licensed under the GNU General Public License Version 2 as well. Not sure what this means? See the [[doku>wiki:faq#licenses_explained|FAQ on the Licenses]]. \ No newline at end of file -- cgit v1.2.3