X-Git-Url: https://git.cworth.org/git?p=notmuch-wiki;a=blobdiff_plain;f=COPYING.mdwn;h=381b4be77e00916e0d21b3faaf8db97712e184cc;hp=b2aed5cde5b07b7d45a27df10de352f31d58d1ea;hb=HEAD;hpb=8ca2edf66a79cd4dcc628cafc0c9801007f2ab71 diff --git a/COPYING.mdwn b/COPYING.mdwn index b2aed5c..381b4be 100644 --- a/COPYING.mdwn +++ b/COPYING.mdwn @@ -4,16 +4,16 @@ 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/) Creative Commons License +- [CC-BY-SA-3.0](https://creativecommons.org/licenses/by-sa/3.0/) Creative Commons License -- [The GNU General Public License](http://www.gnu.org/licenses/gpl.txt), either +- [The GNU General Public License](https://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 +[Notmuch source tree](https://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), +[the GNU General Public License](https://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 @@ -21,4 +21,4 @@ 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. +in the [[COPYING-GPL-3]] and [[COPYING-CC-BY-SA-3.0]] files.