From 05595b62bb1a543f8055dfb75bec7377120eb518 Mon Sep 17 00:00:00 2001 From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com> Date: Thu, 30 Nov 2023 15:26:46 -0500 Subject: [PATCH] Refs #340: Swap old 'CLA' for the DCO (#598) (#875) Co-authored-by: Maxwell G (cherry picked from commit ca0b2dfeaf9fa8502c23e9e0c1a497d7c1d32111) Co-authored-by: Greg "Gwmngilfen" Sutcliffe --- CONTRIBUTING.md | 11 ++++++ DCO | 37 +++++++++++++++++++ .../collection_requirements.rst | 1 - .../contributor_license_agreement.rst | 7 ---- .../developer_certificate_of_origin.rst | 11 ++++++ .../docsite/rst/community/getting_started.rst | 2 +- docs/docsite/rst/dev_guide/ansible_index.rst | 2 +- docs/docsite/rst/dev_guide/core_index.rst | 2 +- .../developing_modules_checklist.rst | 2 +- 9 files changed, 63 insertions(+), 12 deletions(-) create mode 100644 CONTRIBUTING.md create mode 100644 DCO delete mode 100644 docs/docsite/rst/community/contributor_license_agreement.rst create mode 100644 docs/docsite/rst/community/developer_certificate_of_origin.rst diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000000..713b64960a --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,11 @@ +# How to Contribute + +The ansible-documention project is [GPL-3.0 licensed](COPYING) and accepts contributions through +GitHub pull requests. + +## Certificate of Origin + +By contributing to ansible-documentation, you agree to the Developer Certificate of +Origin (DCO). This document was created by the Linux Kernel community and is a +simple statement that you, as a contributor, have the legal right to make the +contribution. See the [DCO](DCO) file for details. diff --git a/DCO b/DCO new file mode 100644 index 0000000000..8201f99215 --- /dev/null +++ b/DCO @@ -0,0 +1,37 @@ +Developer Certificate of Origin +Version 1.1 + +Copyright (C) 2004, 2006 The Linux Foundation and its contributors. +1 Letterman Drive +Suite D4700 +San Francisco, CA, 94129 + +Everyone is permitted to copy and distribute verbatim copies of this +license document, but changing it is not allowed. + + +Developer's Certificate of Origin 1.1 + +By making a contribution to this project, I certify that: + +(a) The contribution was created in whole or in part by me and I + have the right to submit it under the open source license + indicated in the file; or + +(b) The contribution is based upon 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 same open source license (unless I am + permitted to submit under a different license), as indicated + in the file; or + +(c) The contribution was provided directly to me by some other + person who certified (a), (b) or (c) and I have not modified + it. + +(d) 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, including my sign-off) is + maintained indefinitely and may be redistributed consistent with + this project or the open source license(s) involved. diff --git a/docs/docsite/rst/community/collection_contributors/collection_requirements.rst b/docs/docsite/rst/community/collection_contributors/collection_requirements.rst index b0e43715ef..7fd4d9e425 100644 --- a/docs/docsite/rst/community/collection_contributors/collection_requirements.rst +++ b/docs/docsite/rst/community/collection_contributors/collection_requirements.rst @@ -333,7 +333,6 @@ prevent unwelcome licensing changes that can occur when one entity owns the copyrights for an entire project, and lower barriers to contribution. - .. _coll_repo_management: Repository management diff --git a/docs/docsite/rst/community/contributor_license_agreement.rst b/docs/docsite/rst/community/contributor_license_agreement.rst deleted file mode 100644 index b0a0f11736..0000000000 --- a/docs/docsite/rst/community/contributor_license_agreement.rst +++ /dev/null @@ -1,7 +0,0 @@ -.. _contributor_license_agreement: - -****************************** -Contributors License Agreement -****************************** - -By contributing you agree that these contributions are your own (or approved by your employer) and you grant a full, complete, irrevocable copyright license to all users and developers of the project, present and future, pursuant to the license of the project. diff --git a/docs/docsite/rst/community/developer_certificate_of_origin.rst b/docs/docsite/rst/community/developer_certificate_of_origin.rst new file mode 100644 index 0000000000..1893c14385 --- /dev/null +++ b/docs/docsite/rst/community/developer_certificate_of_origin.rst @@ -0,0 +1,11 @@ +.. _developer_certificate_of_origin: + +******************************* +Developer Certificate Of Origin +******************************* + +By contributing to this project you agree to the Developer Certificate of +Origin (DCO). This document was created by the Linux Kernel community and is a +simple statement that you, as a contributor, have the legal right to make the +contribution. See the `DCO file `_ +file for details. diff --git a/docs/docsite/rst/community/getting_started.rst b/docs/docsite/rst/community/getting_started.rst index b35225163b..5eb4c4689d 100644 --- a/docs/docsite/rst/community/getting_started.rst +++ b/docs/docsite/rst/community/getting_started.rst @@ -10,7 +10,7 @@ Welcome and thank you for getting more involved with the Ansible community. Here :maxdepth: 2 code_of_conduct - contributor_license_agreement + developer_certificate_of_origin communication how_can_I_help diff --git a/docs/docsite/rst/dev_guide/ansible_index.rst b/docs/docsite/rst/dev_guide/ansible_index.rst index 0ec3f1a456..a5c6f90ae5 100644 --- a/docs/docsite/rst/dev_guide/ansible_index.rst +++ b/docs/docsite/rst/dev_guide/ansible_index.rst @@ -60,7 +60,7 @@ Find the task that best describes what you want to do: * I want to :ref:`understand how to contribute to Ansible `. * I want to :ref:`contribute my module or plugin `. - * I want to :ref:`understand the license agreement ` for contributions to Ansible. + * I want to :ref:`understand the DCO agreement ` for contributions to the `Ansible Core `_ and `Ansible Documentation `_ repositories. If you prefer to read the entire guide, here's a list of the pages in order. diff --git a/docs/docsite/rst/dev_guide/core_index.rst b/docs/docsite/rst/dev_guide/core_index.rst index 2bd630e3d5..1e9555cc50 100644 --- a/docs/docsite/rst/dev_guide/core_index.rst +++ b/docs/docsite/rst/dev_guide/core_index.rst @@ -57,7 +57,7 @@ Find the task that best describes what you want to do: * I want to :ref:`understand how to contribute to Ansible `. * I want to :ref:`contribute my module or plugin `. - * I want to :ref:`understand the license agreement ` for contributions to Ansible. + * I want to :ref:`understand the DCO agreement ` for contributions to the `Ansible Core `_ and `Ansible Documentation `_ repositories. If you prefer to read the entire guide, here's a list of the pages in order. diff --git a/docs/docsite/rst/dev_guide/developing_modules_checklist.rst b/docs/docsite/rst/dev_guide/developing_modules_checklist.rst index c11689f05c..c64f3f4170 100644 --- a/docs/docsite/rst/dev_guide/developing_modules_checklist.rst +++ b/docs/docsite/rst/dev_guide/developing_modules_checklist.rst @@ -20,7 +20,7 @@ To contribute a module to most Ansible collections, you must: * use proper :ref:`Python 3 syntax ` * follow `PEP 8 `_ Python style conventions - see :ref:`testing_pep8` for more information * license your module under the GPL license (GPLv3 or later) -* understand the :ref:`license agreement `, which applies to all contributions +* understand the :ref:`DCO agreement `, which applies to contributions to the `Ansible Core `_ and `Ansible Documentation `_ repositories. * conform to Ansible's :ref:`formatting and documentation ` standards * include comprehensive :ref:`tests ` for your module * minimize module dependencies