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.

diff --git a/COPYING-GPL-ONLY.mdwn b/COPYING-GPL-ONLY.mdwn
new file mode 100644 (file)
index 0000000..8368781
--- /dev/null
+++ b/COPYING-GPL-ONLY.mdwn
@@ -0,0 +1,3 @@
+The source fragment linking to this page is (only) licensed under
+ [The GNU General Public License](http://www.gnu.org/licenses/gpl.txt),
+ either version 3.0 or at your option any later version.

diff --git a/COPYING.mdwn b/COPYING.mdwn
new file mode 100644 (file)
index 0000000..b2aed5c
--- /dev/null
+++ b/COPYING.mdwn
@@ -0,0 +1,24 @@
+[[!img notmuch-logo.png alt="Notmuch logo" class="left"]]
+# License
+
+The contents of this wiki are (unless otherwise explicitly noted, see below)
+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.
+
+The [[Notmuch manual pages|manpages]], copied from the
+[Notmuch source tree](http://git.notmuchmail.org/git/notmuch) and
+modified for the wiki, *and* any source code fragment specifically
+marked by its contributor as [[COPYING-GPL-ONLY]] are licensed under
+[the GNU General Public License](http://www.gnu.org/licenses/gpl.txt),
+either version 3.0 or at your option any later version.
+
+By pushing to the repository you agree that all of your contributions to the
+Notmuch wiki comply with the above.
+
+Copies of the license texts should be included in the
+[[wiki repository|wikiwriteaccess]],
+in the COPYING-GPL-3 and COPYING-CC-BY-SA-3.0 files.

diff --git a/index.mdwn b/index.mdwn
index 96dc014f30cc6b107da39d8b55498b56c65c689a..7006b6ecccb26b0e3d7c544840f17cdaf621121d 100644 (file)
--- a/index.mdwn
+++ b/index.mdwn
@@ -164,4 +164,5 @@ for non-subscribers.
 ## Website
 
 This wiki is maintained using [ikiwiki](http://ikiwiki.info). Here are
-[[instructions on how to edit the wiki|wikiwriteaccess]].
+[[instructions on how to edit the wiki|wikiwriteaccess]]. The wiki contents are
+mostly [[dual licensed under CC-BY-SA-3.0 and GPLv3+|COPYING]].

diff --git a/manpages.mdwn b/manpages.mdwn
index eea298934bf7f058883e8268527cbbb326dda3ad..16ac3ea094efe7b81a92c47b664a66aeab922e48 100644 (file)
--- a/manpages.mdwn
+++ b/manpages.mdwn
@@ -15,3 +15,7 @@ Manual page index
 * <a href='notmuch-tag-1/'>notmuch-tag</a>(1) - add/remove tags for all messages matching the search terms
 * <a href='notmuch-hooks-5/'>notmuch-hooks</a>(5) - hooks for notmuch
 * <a href='notmuch-search-terms-7/'>notmuch-search-terms</a>(7) - syntax for notmuch queries
+
+The manual pages are licensed under
+[the GNU General Public License](http://www.gnu.org/licenses/gpl.txt),
+either version 3.0 or at your option any later version.

diff --git a/manpages/COPYING.mdwn b/manpages/COPYING.mdwn
new file mode 100644 (file)
index 0000000..93e8b20
--- /dev/null
+++ b/manpages/COPYING.mdwn
@@ -0,0 +1,2 @@
+The manual pages are licensed under under the GNU General Public License, either
+version 3.0 or at your option any later version.

diff --git a/wiki-license.mdwn b/wiki-license.mdwn
index ccea3a97eae03eed8b3f16e78da2e22b38705af3..f901d5d8e891be8a55b24423df08b14e791bbb02 100644 (file)
--- a/wiki-license.mdwn
+++ b/wiki-license.mdwn
@@ -1,14 +1,4 @@
 [[!img notmuch-logo.png alt="Notmuch logo" class="left"]]
 # License
 
-*Warning* This page is just a prototype, the actual licenses are subject to change until this warning is removed.
-
-Any page on this wiki which links to this page (and this page itself) is 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.
-
-Please don't make such links without the consent of the copyright holders.
-
+See [[COPYING]].

diff --git a/wikiwriteaccess.mdwn b/wikiwriteaccess.mdwn
index 40635a9343f9cf03ab3a97e1b199c7c06618145c..12848deaf97c995e66efd4181be330e6492bfb43 100644 (file)
--- 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.