Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision Both sides next revision
wiki:dokuwiki [2009-09-30 15:35:43]
shaun.reitan removed 		wiki:dokuwiki [2011-02-22 19:41:34]
127.0.0.1 external edit
Line 47: Line 47:
 **DokuWiki Feedback and Community** **DokuWiki Feedback and Community**
  
-  * [[doku>mailinglist|Join the mailing list]] :!:+  * [[doku>newsletter|Subscribe to the newsletter]] :!: 
 +  * [[doku>mailinglist|Join the mailing list]]
   * [[http://forum.dokuwiki.org|Check out the user forum]]   * [[http://forum.dokuwiki.org|Check out the user forum]]
   * [[doku>irc|Talk to other users in the IRC channel]]   * [[doku>irc|Talk to other users in the IRC channel]]
Line 57: Line 58:
 ===== Copyright ===== ===== Copyright =====
  
-2004-2009 (c) Andreas Gohr <andi@splitbrain.org>((Please do not contact me for help and support -- use the [[doku>mailinglist]] or [[http://forum.dokuwiki.org|forum]] instead))+2004-2010 (c) Andreas Gohr <andi@splitbrain.org>((Please do not contact me for help and support -- use the [[doku>mailinglist]] or [[http://forum.dokuwiki.org|forum]] instead)) and the DokuWiki Community
  
 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 [[doku>donate|donating]] a few bucks ;-). 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 [[doku>donate|donating]] a few bucks ;-).
- 
-The content published in the DokuWiki at http://www.dokuwiki.org/ 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>faq:license|FAQ on the Licenses]]. Not sure what this means? See the [[doku>faq:license|FAQ on the Licenses]].