Merge remote-tracking branch 's-o-b/contributing-github'
authorW. Trevor King <wking@tremily.us>
Sat, 25 Jan 2014 02:54:47 +0000 (18:54 -0800)
committerW. Trevor King <wking@tremily.us>
Sat, 25 Jan 2014 02:54:47 +0000 (18:54 -0800)
* 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 <wking@tremily.us>
1  2 
CONTRIBUTING.md

diff --cc CONTRIBUTING.md
index 034d98d12af2cfb0130d216f3f3a98ffa19d126c,4ac6435d28deb58af269b9c79fc8ac5ddce19eb0..664a32d2b26cd57979a08d79c703f0904684c58a
@@@ -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.
  
- [SubmittingPatches]: https://github.com/wking/signed-off-by/blob/ab5bce80ad2259b47202b28905efff0d04032709/Documentation/SubmittingPatches
 +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].
 +
+ [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