From: W. Trevor King Date: Sat, 25 Jan 2014 02:54:47 +0000 (-0800) Subject: Merge remote-tracking branch 's-o-b/contributing-github' X-Git-Tag: v3.9~8 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=48ed766de5787407fca095a472e5bd91ce4ca89d;p=rss2email.git Merge remote-tracking branch 's-o-b/contributing-github' * s-o-b/contributing-github: CONTRIBUTING.md: Update SubmittingPatches link developer-certificate-of-origin: Add v1.1 from the Linux Foundation Signed-off-by: W. Trevor King --- 48ed766de5787407fca095a472e5bd91ce4ca89d diff --cc CONTRIBUTING.md index 034d98d,4ac6435..664a32d --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@@ -1,15 -1,9 +1,16 @@@ - This project tracks patch provenance and licensing using the Developer - Certificate of Origin and Signed-off-by tags initially developed by - the Linux kernel project. Because the documentation for this - procedure is licensed under the GPLv2, we have chosen not to include - it in our project directly. Instead, please see + This project tracks patch provenance and licensing using the + [Developer Certificate of Origin][DCO] and Signed-off-by tags + initially developed by the Linux kernel project. Because the + documentation for this procedure is licensed under the GPLv2, we have + chosen not to include it in our project directly. Instead, please see [SubmittingPatches][], which is stored in an external repository. +Rss2email is versioned under the GNU General Public License as +published by the Free Software Foundation, either [version 2 of the +License][GPLv2], or (at your option) [version 3 of the +License][GPLv3]. + - [SubmittingPatches]: https://github.com/wking/signed-off-by/blob/ab5bce80ad2259b47202b28905efff0d04032709/Documentation/SubmittingPatches + [DCO]: developer-certificate-of-origin + [SubmittingPatches]: https://github.com/wking/signed-off-by/blob/7d71be37194df05c349157a2161c7534feaf86a4/Documentation/SubmittingPatches +[GPLv2]: https://github.com/wking/rss2email/blob/49f3dfa686a24ec68c6d225aedc3cb4f5b5cedb0/GPLv2 +[GPLv3]: https://github.com/wking/rss2email/blob/49f3dfa686a24ec68c6d225aedc3cb4f5b5cedb0/GPLv3