From b3a2aaa1d0a2179bc0eb76ddf9b52cf12a575e71 Mon Sep 17 00:00:00 2001 From: Lou DeGenaro Date: Fri, 30 Aug 2024 11:38:18 -0400 Subject: [PATCH 1/5] LF website https://github.com/cncf/foundation/blob/main/website-guidelines.md Signed-off-by: Lou DeGenaro --- README.md | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c706bdc..70edf27 100644 --- a/README.md +++ b/README.md @@ -329,4 +329,29 @@ tests/c2p/test_cli.py::test_version PASSED ### Cleanup caches ``` make clean -``` \ No newline at end of file +``` + + +```text +# Copyright (c) 2024 The OSCAL Compass Authors. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +``` +______________________________________________________________________ + +We are a Cloud Native Computing Foundation sandbox project. + +The Linux Foundation® (TLF) has registered trademarks and uses trademarks. For a list of TLF trademarks, see [Trademark Usage](https://www.linuxfoundation.org/legal/trademark-usage)". + +*Compliance to Policy was originally created by IBM.* From bdcef621f282ee864e6685833188e02eb59606cd Mon Sep 17 00:00:00 2001 From: Yuji Watanabe Date: Sat, 31 Aug 2024 04:45:06 +0900 Subject: [PATCH 2/5] Fix content in readme Signed-off-by: Yuji Watanabe --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 70edf27..b39fc4c 100644 --- a/README.md +++ b/README.md @@ -331,6 +331,10 @@ tests/c2p/test_cli.py::test_version PASSED make clean ``` +## License & Authors + +If you would like to see the detailed LICENSE click [here](LICENSE). +Consult [contributors](https://github.com/oscal-compass/compliance-to-policy/graphs/contributors) for a list of authors and [maintainers](https://github.com/oscal-compass/community/blob/main/MAINTAINERS.md) for the core team. ```text # Copyright (c) 2024 The OSCAL Compass Authors. All rights reserved. From e724611c704f00574fc0dc7ba2a30c2066065f19 Mon Sep 17 00:00:00 2001 From: Lou DeGenaro Date: Fri, 30 Aug 2024 16:09:18 -0400 Subject: [PATCH 3/5] maintainers & cncf logo Signed-off-by: Lou DeGenaro --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index 70edf27..749b97a 100644 --- a/README.md +++ b/README.md @@ -331,6 +331,11 @@ tests/c2p/test_cli.py::test_version PASSED make clean ``` +## License & Authors + +If you would like to see the detailed LICENSE click [here](LICENSE). +Consult [contributors](https://github.com/oscal-compass/compliance-trestle/graphs/contributors) for a list of authors and [maintainers](MAINTAINERS.md) for the core team. + ```text # Copyright (c) 2024 The OSCAL Compass Authors. All rights reserved. @@ -352,6 +357,11 @@ ______________________________________________________________________ We are a Cloud Native Computing Foundation sandbox project. + + + + + The Linux Foundation® (TLF) has registered trademarks and uses trademarks. For a list of TLF trademarks, see [Trademark Usage](https://www.linuxfoundation.org/legal/trademark-usage)". *Compliance to Policy was originally created by IBM.* From f06fcebaafca8136e4033a7f8f5b40f773689df4 Mon Sep 17 00:00:00 2001 From: Lou DeGenaro Date: Fri, 30 Aug 2024 16:14:43 -0400 Subject: [PATCH 4/5] license & authors Signed-off-by: Lou DeGenaro --- README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.md b/README.md index 38adfb2..28d15bc 100644 --- a/README.md +++ b/README.md @@ -334,13 +334,8 @@ make clean ## License & Authors If you would like to see the detailed LICENSE click [here](LICENSE). -<<<<<<< HEAD Consult [contributors](https://github.com/oscal-compass/compliance-trestle/graphs/contributors) for a list of authors and [maintainers](MAINTAINERS.md) for the core team. -======= -Consult [contributors](https://github.com/oscal-compass/compliance-to-policy/graphs/contributors) for a list of authors and [maintainers](https://github.com/oscal-compass/community/blob/main/MAINTAINERS.md) for the core team. ->>>>>>> branch 'LF-website' of https://github.com/oscal-compass/compliance-to-policy.git - ```text # Copyright (c) 2024 The OSCAL Compass Authors. All rights reserved. # From 6d0700199cd74ef9512d566a54719126034e5c6b Mon Sep 17 00:00:00 2001 From: Lou DeGenaro Date: Fri, 30 Aug 2024 16:17:51 -0400 Subject: [PATCH 5/5] fix contributors link Signed-off-by: Lou DeGenaro --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 28d15bc..ce53c2f 100644 --- a/README.md +++ b/README.md @@ -334,7 +334,7 @@ make clean ## License & Authors If you would like to see the detailed LICENSE click [here](LICENSE). -Consult [contributors](https://github.com/oscal-compass/compliance-trestle/graphs/contributors) for a list of authors and [maintainers](MAINTAINERS.md) for the core team. +Consult [contributors](https://github.com/oscal-compass/compliance-to-policy/graphs/contributors) for a list of authors and [maintainers](MAINTAINERS.md) for the core team. ```text # Copyright (c) 2024 The OSCAL Compass Authors. All rights reserved.