diff --git a/site/index.html b/site/index.html index ba201b5..26c6369 100644 --- a/site/index.html +++ b/site/index.html @@ -1029,30 +1029,62 @@ made, but the information there can be made more accurate by setting MXID to your Matrix ID, and DISPLAY_NAME to your real name in your environment, or the .env file. The Subject should very briefly describe what the patch -is about. Below these headers, write a more in-depth description of -the patch. +is about.

-Then, send the resulting patch file to -#telodendria-patches:bancino.net, so it can be -discussed and reviewed by the community. If you don't have a Matrix -account, and you really don't want to create one—ignoring -how odd it is that you are trying to contribute to a Matrix -homeserver project—you can email your patches to -jordan@bancino.net. However, -the preferred way of submitting patches is to the official Matrix room, -so I will upload your patch there along with your email address. If you -are going to send patches via email, they must be plain text emails, -and the patch must be in the main body of the email. No MIME, base64, or -printed-quotable garbage. I will silently reject emails that are not -purely plain text. I should be able to write a raw copy of your message to -an mbox file, and then apply it onto my code right from -there, with no further processing. If you're going to be a regular contributor, -it would just be easier to create a Matrix account. It doesn't have to be -on my public homeserver, but it certainly can be. Note that the discussion and -ultimately the decision on what to do with your patch will all happen in -the Matrix room, so if you submit patches using email, you'll miss out on -any feedback. +You'll also notice these lines: +

+
+[ ] I have read the Telodendria Project developer certificiate of + origin, and certify that I have permission to submit this patch + under the conditions specified in it. +
+

+This is a checkbox that tells me whether or not you actually have +the rights to submit your patch, and that once you submit the patch, +your code is bound by the Telodendria license. The full text of the +developer certificate of origin is as follows: +

+
    +
  1. The contribution was created in whole or in part by me, and I have +the right to submit it under the open source license of the Telodendria +project; or
    2. +
  2. The contribution is based upon a previous work that, to the best +of my knowledge, is covered under an appropriate open-source license +and I have the right under that license to submit that work with +modifications, whether created in whole or in part by me, under the +Telodendria project license; or
    3. +
  3. The contribution was provided directly to me by some other person +who certified (1), (2), or (3), and I have not modified it.
    4. +
  4. I understand and agree that this project and the contribution are +public and that a record of the contribution—including all +personal information I submit with it—is maintained indefinitely +and may be redistributed consistent with this project or the open-source +licenses involved.
    5. +
+

+After the headers, but before the checkbox, write a more thorough +description of the patch and why it was created. Then, send the +resulting patch file to #telodendria-patches:bancino.net, +so it can be discussed and reviewed by the community. If you don't +have a Matrix account, and you really don't want to create +one—ignoring how odd it is that you are trying to contribute +to a Matrix homeserver project—you can email your +patches to jordan@bancino.net. +However, the preferred way of submitting patches is to the official +Matrix room, so I will upload your patch there along with your email +address. If you are going to send patches via email, they must +be plain text emails, and the patch must be in the main body +of the email. No MIME, base64, or printed-quotable garbage. I will +silently reject emails that are not purely plain text. I should be +able to write a raw copy of your message to an mbox +file, and then apply it onto my code right from there, with no +further processing. If you're going to be a regular contributor, +it would just be easier to create a Matrix account. It doesn't have +to be on my public homeserver, but it certainly can be. Note that +the discussion and ultimately the decision on what to do with your +patch will all happen in the Matrix room, so if you submit patches +using email, you'll miss out on any feedback.

Try to keep your patches on topic—make one patch file per feature diff --git a/tools/bin/td b/tools/bin/td index 720b8e3..cb4ac72 100644 --- a/tools/bin/td +++ b/tools/bin/td @@ -234,6 +234,10 @@ recipe_patch() { echo "Date: $(date)" echo "Subject: " echo + echo "[ ] I have read the Telodendria Project developer certificate" + echo " of origin, and certify that I have permission to submit" + echo " this patch under the conditions specified in it." + echo cvs -q diff -uNp $PATCHSET | grep -v '^\? ' ) > "$PATCH_FILE"