1
0
mirror of https://github.com/github/choosealicense.com synced 2024-06-17 16:39:51 +02:00

CERN-OHL: Fix YAML errors in note, tweak language (thanks @waldyrious)

This commit is contained in:
Julian Stirling 2022-06-12 19:55:31 +01:00
parent 5065c967dc
commit 6911db7ba1
3 changed files with 8 additions and 5 deletions

View File

@ -3,11 +3,12 @@ title: CERN Open Hardware Licence Version 2 - Permissive
spdx-id: CERN-OHL-P-2.0
nickname: CERN OHL v2 Permissive
description: The CERN OHL was drafted with hardware in mind. On top of licensing copyright like software and documentation licenses, it also licenses patents. This “Permissive” variant allows people to take your code, relicense it and use it without any obligation to distribute the sources when they ship a product; it does have an attribution requirement.
description: The CERN OHL was drafted with hardware in mind. On top of licensing copyright like software and documentation licenses, it also licenses patents. This “Permissive” variant allows people to take your code, relicense it and use it without any obligation to distribute the sources when they ship a product; however, it does have an attribution requirement.
how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file.
note: CERN <a href="https://ohwr.org/project/cernohl/wikis/uploads/8a6b5d01f71c207c49493e4d114d61e6/cern_ohl_p_v2_howto.pdf">recommends</a> adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product.
note:
CERN <a href="https://ohwr.org/project/cernohl/wikis/uploads/8a6b5d01f71c207c49493e4d114d61e6/cern_ohl_p_v2_howto.pdf">recommends</a> adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product.
using:
tedium: https://github.com/jboone/tedium/blob/master/LICENSE-CERN-OHL-P-v2

View File

@ -3,11 +3,12 @@ title: CERN Open Hardware Licence Version 2 - Strongly Reciprocal
spdx-id: CERN-OHL-S-2.0
nickname: CERN OHL v2 Strongly Reciprocal
description: The CERN OHL was drafted with hardware in mind. On top of licensing copyright like software and documentation licenses, it also licenses patents. This “Strongly Reciprocal” variant applies to a complete design, and if a CERN-OHL-S-2.0 file is used in a project then the full project must be released under the CERN-OHL-S-2.0 (or a compatible license).
description: The CERN OHL was drafted with hardware in mind. On top of licensing copyright like software and documentation licenses, it also licenses patents. This “Strongly Reciprocal” variant applies to a complete design, so if a CERN-OHL-S-2.0 file is used in a project then the full project must be released under the CERN-OHL-S-2.0 (or a compatible license).
how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file.
note: CERN <a href="https://ohwr.org/project/cernohl/wikis/uploads/cf37727497ca2b5295a7ab83a40fcf5a/cern_ohl_s_v2_user_guide.pdf">recommends</a> adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product.
note:
CERN <a href="https://ohwr.org/project/cernohl/wikis/uploads/cf37727497ca2b5295a7ab83a40fcf5a/cern_ohl_s_v2_user_guide.pdf">recommends</a> adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product.
using:
USB Armory: https://github.com/f-secure-foundry/usbarmory/blob/master/hardware/mark-two/LICENSE

View File

@ -7,7 +7,8 @@ description: The CERN OHL was drafted with hardware in mind. On top of licensin
how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file.
note: CERN <a href="https://ohwr.org/project/cernohl/wikis/uploads/c2e5e9d297949b5c2d324a6cbf6adda0/cern_ohl_w_v2_howto.pdf">recommends</a> adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product.
note:
CERN <a href="https://ohwr.org/project/cernohl/wikis/uploads/c2e5e9d297949b5c2d324a6cbf6adda0/cern_ohl_w_v2_howto.pdf">recommends</a> adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product.
using:
Simple PCIe FMC carrier: https://ohwr.org/project/spec/blob/master/LICENSES/CERN-OHL-W-2.0.txt