summaryrefslogtreecommitdiff
path: root/docs/internals/contributing/writing-code
diff options
context:
space:
mode:
authorJacob Walls <jacobtylerwalls@gmail.com>2026-02-09 10:29:26 -0500
committerJacob Walls <jacobtylerwalls@gmail.com>2026-02-10 09:58:39 -0500
commit0dac3dd4a1573b3c9cef3aea6a98440decfc5460 (patch)
treeafbc03518a349576e2b6942b203d61e54bd01534 /docs/internals/contributing/writing-code
parent3c09ed81d3e90d7ce60372096c58e80548d1d2ef (diff)
Clarified optional nature of Contributor License Agreement.
It's not clear that CLAs are needed to ensure contributors are assenting to our license (the "inbound=outbound" agreement), but we can keep them around for contributors who would like to (or are required by their employer) to submit one, without investing additional resources in checking every single contribution. See https://forum.djangoproject.com/t/cla-vs-dco-for-django-contributors/42399 and recent board minutes.
Diffstat (limited to 'docs/internals/contributing/writing-code')
-rw-r--r--docs/internals/contributing/writing-code/submitting-patches.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/internals/contributing/writing-code/submitting-patches.txt b/docs/internals/contributing/writing-code/submitting-patches.txt
index 9c1d417031..6900045cc0 100644
--- a/docs/internals/contributing/writing-code/submitting-patches.txt
+++ b/docs/internals/contributing/writing-code/submitting-patches.txt
@@ -59,11 +59,10 @@ and time availability), claim it by following these steps:
* Finally click the "Submit changes" button at the bottom to save.
.. note::
- The Django software foundation requests that anyone contributing more than
- a :ref:`trivial change <trivial-change>`, to Django sign and submit a
- `Contributor License Agreement`_, this ensures that the Django Software
- Foundation has clear license to all contributions allowing for a clear
- license for all users.
+ If your change is not :ref:`trivial <trivial-change>`, you have the option
+ to sign and submit a `Contributor License Agreement`_ clarifying the status
+ of your contribution. This ensures that the Django Software Foundation has
+ clear license to your contribution.
.. _Login using your GitHub account: https://code.djangoproject.com/github/login
.. _Create an account: https://www.djangoproject.com/accounts/register/
@@ -508,7 +507,8 @@ All tickets
* Is the pull request a single squashed commit with a message that follows our
:ref:`commit message format <committing-guidelines>`?
* Are you the patch author and a new contributor? Please add yourself to the
- :source:`AUTHORS` file and submit a `Contributor License Agreement`_.
+ :source:`AUTHORS` file. At your option, submit a
+ `Contributor License Agreement`_.
* Does this have an accepted ticket on Trac? All contributions require a ticket
unless the :ref:`change is considered trivial <trivial-change>`.