diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 47af85652..6c39394ea 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -67,7 +67,7 @@ For UI changes, include: - [ ] No proprietary source, documentation wording, tests, UI, screenshots, or restricted engineering material was copied. - [ ] Third-party components and licenses are identified. - [ ] Public license, commercial-license, and trademark wording remains accurate. -- [ ] Commits include the required DCO sign-off. +- [ ] I have read and affirmatively agree to the [Contributor License Agreement](../CONTRIBUTOR-LICENSE-AGREEMENT.md) for this contribution, and I have the rights and any required authorization to submit it. ## Independent implementation and provenance diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 82cb6d60e..46f7aea14 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -63,7 +63,7 @@ A pull request should: - use synthetic, public-domain, or contributor-owned test data; - update public documentation when behavior, maturity, safety, or claim boundaries change; - preserve the GPL community license and separate commercial-licensing wording; -- include a signed-off commit as required by the project DCO. +- document contribution authorship, origin, and required third-party rights; a DCO commit sign-off is not required. For UI changes, include the tested Windows scaling level, resolution, keyboard workflow, and any accessibility impact. For protocol, reporting, GOOSE, SMV, file-transfer, SCL, or control changes, state whether validation used unit tests, deterministic fixtures, loopback, simulator, or an authorized laboratory IED. @@ -72,16 +72,12 @@ For UI changes, include the tested Windows scaling level, resolution, keyboard w The current public project is distributed under `GPL-3.0-or-later` and maintains a separate commercial-licensing path. Before merge, contributors must: - read and affirmatively agree to [CONTRIBUTOR-LICENSE-AGREEMENT.md](CONTRIBUTOR-LICENSE-AGREEMENT.md); -- sign off every commit under [DCO.txt](DCO.txt); +- retain accurate Git authorship and document contribution provenance in the pull request; - have the legal right and any required employer authorization to contribute; - avoid confidential, proprietary, restricted, customer-owned, or security-sensitive material; - identify any third-party component and its license before introducing it. -Example sign-off: - -```text -Signed-off-by: Contributor Name -``` +ARSAS does not request or require DCO `Signed-off-by` trailers on new commits. [DCO.txt](DCO.txt) and sign-offs in existing Git history are retained as historical records, not active merge requirements. CLA agreement and source/provenance review remain required. ## Clean-room and data provenance diff --git a/docs/LICENSING.md b/docs/LICENSING.md index eee7553fd..6854012a8 100644 --- a/docs/LICENSING.md +++ b/docs/LICENSING.md @@ -24,7 +24,7 @@ ArIED links directly to ARIEC61850. A distributed combined build must use mutual ## Contributions and branding -New contributions require DCO sign-off and agreement to [CONTRIBUTOR-LICENSE-AGREEMENT.md](../CONTRIBUTOR-LICENSE-AGREEMENT.md). Branding is governed separately by [TRADEMARK.md](../TRADEMARK.md). +New contributions require affirmative agreement to [CONTRIBUTOR-LICENSE-AGREEMENT.md](../CONTRIBUTOR-LICENSE-AGREEMENT.md), accurate authorship and provenance, and review of any third-party rights. DCO commit sign-off is not required for new contributions; existing sign-offs remain part of Git history. Branding is governed separately by [TRADEMARK.md](../TRADEMARK.md). ## Ownership boundary