diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/internals/contributing/new-contributors.txt | 4 | ||||
| -rw-r--r-- | docs/internals/contributing/writing-code/submitting-patches.txt | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/docs/internals/contributing/new-contributors.txt b/docs/internals/contributing/new-contributors.txt index 63835289eb..bf80dee365 100644 --- a/docs/internals/contributing/new-contributors.txt +++ b/docs/internals/contributing/new-contributors.txt @@ -69,8 +69,8 @@ Sign the Contributor License Agreement -------------------------------------- The code that you write belongs to you or your employer. If your contribution -is more than one or two lines of code, you need to sign the `CLA`_. See the -`Contributor License Agreement FAQ`_ for a more thorough explanation. +is more than one or two lines of code, you have the option to sign the `CLA`_. +See the `Contributor License Agreement FAQ`_ for a more thorough explanation. .. _CLA: https://www.djangoproject.com/foundation/cla/ .. _Contributor License Agreement FAQ: https://www.djangoproject.com/foundation/cla/faq/ 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>`. |