Replace section in CONTRIBUTING.md

This patch replaces the "Contributor License Agreement" section in the
CONTRIBUTING.md with "Developers Certificate of Origin" and includes the
DCO inline there.

The CONTRIBTOR-LICENSE-AGREEMENT.md file was removed therefore.

Signed-off-by: Matthias Beyer <matthias.beyer@ifm.com>

2 files changed, 39 insertions, 52 deletions

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 479187f8..37ece4bf 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -73,20 +73,10 @@ Once a PR has the necessary approvals, it can be merged. Here’s how the merge
   is responsible for cleaning up the commit message according to the previously
   stated commit message guidance.
 
-# Contributor License Agreement
+# Developers Certificate of Origin
 
-We do not want to bother you with too much legalese, but there are two pages you
-have to read carefully, this page and the CONTRIBUTOR LICENSE AGREEMENT.
-
-## Signing the CONTRIBUTOR LICENSE AGREEMENT
-
-Each Contribution to Software AG's Open Source Projects must be accompanied by a
-sign-off indicating acceptance of current version of the CONTRIBUTOR LICENSE
-AGREEMENT, which is derived from the Apache Foundation's Individual Contributor
-License Agreement, sign-off time stamp relates to corresponding version of the
-CONTRIBUTOR LICENSE AGREEMENT maintained here on GitHub as well. Sign-Off and
-acceptance of the CONTRIBUTOR LICENSE AGREEMENT is declared by using  the option
-"-s" in
+Sign-Off and acceptance of the Developers Ceritificate of Origin (DCO) is
+declared by using the option "-s" in
 
 > git commit -s
 
@@ -96,11 +86,42 @@ which will automatically generate a sign-off statement in the form:
 
 By adding this sign-off statement, you are certifying:
 
-*By signing-off on this Submission, I agree to be bound by the terms of the
-**then current CONTRIBUTOR LICENSE AGREEMENT** located at
-https://github.com/thin-edge/thin-edge.io/blob/main/CONTRIBUTOR-LICENSE-AGREEMENT.md,
-**which I have read and understood** and I agree that this Submission
-constitutes a "Contribution" under this Agreement.*
+```
+Developer Certificate of Origin
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+
+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.
+```
 
 ## Note on Privacy
 
diff --git a/CONTRIBUTOR-LICENSE-AGREEMENT.md b/CONTRIBUTOR-LICENSE-AGREEMENT.md
deleted file mode 100644
index 49b8cb05..00000000
--- a/CONTRIBUTOR-LICENSE-AGREEMENT.md
+++ /dev/null
@@ -1,34 +0,0 @@
-Developer Certificate of Origin
-Version 1.1
-
-Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
-
-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.