From b47650bfabcf84c37afeed987d1ec571b4ef5e92 Mon Sep 17 00:00:00 2001
From: Ryan Pavlik <ryan.pavlik@collabora.com>
Date: Wed, 3 Nov 2021 14:25:33 -0500
Subject: [PATCH] docs: Fix license extraction for readme/contributing

---
 CONTRIBUTING.md | 15 ++++++---------
 README.md       | 23 ++++++++---------------
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c40c49c45..8019fdf5e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,5 +1,11 @@
 # Contribution Guidelines
 
+<!--
+Copyright 2018-2019 Collabora, Ltd.
+
+SPDX-License-Identifier: CC-BY-4.0
+-->
+
 There are plenty of valid reasons why someone might not be able
 to follow all of the guidelines in this section, and that's OK,
 especially for new contributors or those new to open source entirely.
@@ -71,12 +77,3 @@ bug reports should include:
   - if you cannot disclose your code, or even if you can,
     an "artificial", minimally-sized example can be very valuable.
 
----
-
-## Copyright and License for this CONTRIBUTING.md file
-
-For this file only:
-
-> Copyright 2018-2019 Collabora, Ltd.
->
-> SPDX-License-Identifier: CC-BY-4.0
diff --git a/README.md b/README.md
index 829ebd381..d539ff6cb 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
 # Monado - XR Runtime (XRT)
 
 <!--
-Copyright 2018-2020, Collabora, Ltd.
+Copyright 2018-2021, Collabora, Ltd.
+
 SPDX-License-Identifier: CC-BY-4.0
 
 This must stay in sync with the last section!
@@ -284,17 +285,9 @@ reported by contacting:
   * Ryan Pavlik <ryan.pavlik@collabora.com>
 * freedesktop.org contacts: see most recent list at <https://www.freedesktop.org/wiki/CodeOfConduct/>
 
-## Copyright and License for this README.md file
-
-For this file only:
-
-> Copyright 2018-2020, Collabora, Ltd.
-> Code of Conduct section: excerpt adapted from the [Contributor Covenant](https://www.contributor-covenant.org), version 1.4.1,
-> available at <https://www.contributor-covenant.org/version/1/4/code-of-conduct.html>,
-> and from the freedesktop.org-specific version of that code,
-> available at <https://www.freedesktop.org/wiki/CodeOfConduct/>
->
->
-> SPDX-License-Identifier: CC-BY-4.0
-
-<!-- This must stay in sync with the comment at the start! -->
+Code of Conduct section excerpt adapted from the
+[Contributor Covenant](https://www.contributor-covenant.org), version 1.4.1,
+available at
+<https://www.contributor-covenant.org/version/1/4/code-of-conduct.html>, and
+from the freedesktop.org-specific version of that code, available at
+<https://www.freedesktop.org/wiki/CodeOfConduct/>, used under CC-BY-4.0.