Skip to content

Commit

Permalink
Refs #340: Swap old 'CLA' for the DCO (#598) (#874)
Browse files Browse the repository at this point in the history
Co-authored-by: Maxwell G <maxwell@gtmx.me>
(cherry picked from commit ca0b2df)

Co-authored-by: Greg "Gwmngilfen" Sutcliffe <github@emeraldreverie.org>
  • Loading branch information
patchback[bot] and GregSutcliffe committed Nov 30, 2023
1 parent edecb6e commit 8d4e868
Show file tree
Hide file tree
Showing 9 changed files with 63 additions and 12 deletions.
11 changes: 11 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -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.
37 changes: 37 additions & 0 deletions DCO
Original file line number Diff line number Diff line change
@@ -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.
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,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
Expand Down
7 changes: 0 additions & 7 deletions docs/docsite/rst/community/contributor_license_agreement.rst

This file was deleted.

11 changes: 11 additions & 0 deletions docs/docsite/rst/community/developer_certificate_of_origin.rst
Original file line number Diff line number Diff line change
@@ -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 <https://github.com/ansible-documentation/blob/devel/DCO>`_
file for details.
2 changes: 1 addition & 1 deletion docs/docsite/rst/community/getting_started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/docsite/rst/dev_guide/ansible_index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Find the task that best describes what you want to do:

* I want to :ref:`understand how to contribute to Ansible <ansible_community_guide>`.
* I want to :ref:`contribute my module or plugin <developing_modules_checklist>`.
* I want to :ref:`understand the license agreement <contributor_license_agreement>` for contributions to Ansible.
* I want to :ref:`understand the DCO agreement <developer_certificate_of_origin>` for contributions to the `Ansible Core <https://github.com/ansible/ansible>`_ and `Ansible Documentation <https://github.com/ansible/ansible-documentation>`_ repositories.

If you prefer to read the entire guide, here's a list of the pages in order.

Expand Down
2 changes: 1 addition & 1 deletion docs/docsite/rst/dev_guide/core_index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Find the task that best describes what you want to do:

* I want to :ref:`understand how to contribute to Ansible <ansible_community_guide>`.
* I want to :ref:`contribute my module or plugin <developing_modules_checklist>`.
* I want to :ref:`understand the license agreement <contributor_license_agreement>` for contributions to Ansible.
* I want to :ref:`understand the DCO agreement <developer_certificate_of_origin>` for contributions to the `Ansible Core <https://github.com/ansible/ansible>`_ and `Ansible Documentation <https://github.com/ansible/ansible-documentation>`_ repositories.

If you prefer to read the entire guide, here's a list of the pages in order.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ To contribute a module to most Ansible collections, you must:
* use proper :ref:`Python 3 syntax <developing_python_3>`
* follow `PEP 8 <https://www.python.org/dev/peps/pep-0008/>`_ 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 <contributor_license_agreement>`, which applies to all contributions
* understand the :ref:`DCO agreement <developer_certificate_of_origin>`, which applies to contributions to the `Ansible Core <https://github.com/ansible/ansible>`_ and `Ansible Documentation <https://github.com/ansible/ansible-documentation>`_ repositories.
* conform to Ansible's :ref:`formatting and documentation <developing_modules_documenting>` standards
* include comprehensive :ref:`tests <developing_testing>` for your module
* minimize module dependencies
Expand Down

0 comments on commit 8d4e868

Please sign in to comment.