summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2006-01-30 22:48:40 +0100
committerAndreas Gohr <andi@splitbrain.org>2006-01-30 22:48:40 +0100
commit262065ef163a417eb96dded78316e67b5c803caf (patch)
tree8e88d30b3a880abedc9f7eae034042a033e7c08c /data
parent24bc1a35cb0f3d8b9e1c9bc6e45294f4eb31acef (diff)
downloadrpg-262065ef163a417eb96dded78316e67b5c803caf.tar.gz
rpg-262065ef163a417eb96dded78316e67b5c803caf.tar.bz2
language updates
darcs-hash:20060130214840-7ad00-ef1974692b64d4e4f7420d5c68f70f113630957b.gz
Diffstat (limited to 'data')
-rw-r--r--data/pages/wiki/dokuwiki.txt4
1 files changed, 3 insertions, 1 deletions
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&amp;item_name=DokuWiki+Donation&amp;no_shipping=1&amp;no_note=1&amp;tax=0&amp;currency_code=EUR&amp;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