Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: lf footer website guidelines #1678

Merged
merged 13 commits into from
Sep 3, 2024
Merged

fix: lf footer website guidelines #1678

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5e478c1
LF footer website guidelines
degenaro Aug 30, 2024
3de7de8
make mdformat
degenaro Aug 30, 2024
36f5470
Trestle created
degenaro Aug 30, 2024
a72fe2a
fix maintainers link
degenaro Aug 30, 2024
9f33b75
<hr>
degenaro Aug 30, 2024
a9cb321
remove hr
degenaro Aug 30, 2024
1324fca
fix maintainers reference
degenaro Aug 30, 2024
c25a3bc
And license.
degenaro Aug 30, 2024
6ba55b2
add cncf logo
degenaro Aug 30, 2024
1d73002
fix trestle website too
degenaro Aug 30, 2024
d97ac7e
restore maintainers.md
degenaro Sep 2, 2024
86553f7
remove Red Hat from footer, per Red Hat request
degenaro Sep 3, 2024
edd29df
Merge branch 'develop' into LF-website-guidelines
degenaro Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ 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) 2020 IBM Corp. All rights reserved.
# Copyright (c) 2024 The OSCAL Compass Authors. All rights reserved.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the story on the headers in the python files?

Do we need to replace those as well? @jpower432

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've seen nothing the in the CNCF read and understand documentation for such a requirement. Just about acceptable licenses, which we have already.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here is some CNCF guidance I found around copyright notices. I do think updating existing notices is something we should complete based this guidance and CNCF project convention, but this could be considered out of scope for this PR IMO.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The guidance clearly states: Please note that it is not wrong, and it is acceptable, if a contributor wishes to keep their own copyright notices on their contributions. The above is a recommended format for ease of use, but is not mandated by CNCF. My view is that we should leave the existing notices in place, and any new modules will get the new notice. However, it the majority feel uniformity is desirable I will not be a blocker.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@degenaro I understand. I did not mean to imply this was a requirement. I read it as a recommendation. In any case, it seems we would need prior approval per this section of the guidance - You should not change or remove someone else's copyright notice unless they have expressly permitted you to do so. This includes third parties' notices in pre-existing code.

#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -125,5 +125,17 @@ Consult [contributors](https://github.com/oscal-compass/compliance-trestle/graph
# 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.

<picture>
<source media="(prefers-color-scheme: dark)" srcset="https://www.cncf.io/wp-content/uploads/2022/07/cncf-white-logo.svg">
<img src="https://www.cncf.io/wp-content/uploads/2022/07/cncf-color-bg.svg" width=300 />
</picture>

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)".
jpower432 marked this conversation as resolved.
Show resolved Hide resolved

*Trestle was originally created by IBM and Red Hat.*
14 changes: 12 additions & 2 deletions docs/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ 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/) for the core team.

```text
# Copyright (c) 2020 IBM Corp. All rights reserved.
# 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.
Expand All @@ -98,5 +98,15 @@ Consult [contributors](https://github.com/oscal-compass/compliance-trestle/graph
# 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.

<picture>
<source media="(prefers-color-scheme: dark)" srcset="https://www.cncf.io/wp-content/uploads/2022/07/cncf-white-logo.svg">
<img src="https://www.cncf.io/wp-content/uploads/2022/07/cncf-color-bg.svg" width=300 />
</picture>

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)".
Loading