diff options
| author | Jani Nikula <jani@nikula.org> | 2014-10-12 22:53:30 +0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2014-10-15 10:31:04 +0200 |
| commit | 8ca2edf66a79cd4dcc628cafc0c9801007f2ab71 (patch) | |
| tree | a35cefbf8d29e2f1452ff4c3d17dac6981b556ba /wikiwriteaccess.mdwn | |
| parent | 7efa7c88aa74158186485d456c6b7f473aa6ce28 (diff) | |
COPYING: The wiki is now dual licensed under CC-BY-SA-3.0 and GPL v3+
All the content in the wiki now falls into one of these categories, in
decreasing order of quantity:
* The authors have agreed that all of their contributions to the notmuch
wiki can be dual licensed under CC-BY-SA-3.0 and GPL v3+.
* The content is copied from the notmuch main repository and is licensed
under GPL v3+. Effectively this is the man pages.
* The authors have not been reached but their contribution have been a
very minor or trivial change or cleanup of content falling into above
categories.
* The authors have not been reached but the content has been deleted.
Diffstat (limited to 'wikiwriteaccess.mdwn')
| -rw-r--r-- | wikiwriteaccess.mdwn | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/wikiwriteaccess.mdwn b/wikiwriteaccess.mdwn index 40635a9..12848de 100644 --- a/wikiwriteaccess.mdwn +++ b/wikiwriteaccess.mdwn @@ -28,11 +28,4 @@ configuration options set. ## License -We are in the process of updating the wiki license. By pushing to the repository -you agree that all of your contributions to the notmuch wiki will be dual -licensed under: - -- [CC-BY-SA-3.0](http://creativecommons.org/licenses/by-sa/3.0/) <img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-sa/3.0/88x31.png" /> - -- [The GNU General Public License](http://www.gnu.org/licenses/gpl.txt), either - version 3.0 or at your option any later version. +See the [[Notmuch wiki license terms|COPYING]] before pushing any changes. |