From 78c2ee95a408456aedded2533ac4b8416bfb6f21 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 8 Jul 2022 12:09:10 -0700 Subject: [PATCH] tighten up non-software text --- non-software.md | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/non-software.md b/non-software.md index 7709ca7..bd723a3 100644 --- a/non-software.md +++ b/non-software.md @@ -4,11 +4,11 @@ layout: default permalink: /non-software/ --- -Open source software licenses can be also used for non-software works and are often the best choice, especially when the works in question can be edited and versioned as source (e.g., [open source hardware](https://www.oshwa.org/definition/) designs). [Choose an open source license here.](/licenses/) +Open source software licenses can be also used for non-software works and are often the best choice, especially when the works in question can be edited and versioned as source. [Choose an open source license](/). ### Data, media, etc. -[CC0-1.0](/licenses/cc0-1.0/), [CC-BY-4.0](/licenses/cc-by-4.0/), and [CC-BY-SA-4.0](/licenses/cc-by-sa-4.0/) are [open](https://opendefinition.org) licenses used for non-software material ranging from datasets to videos. Note that CC-BY-4.0 and CC-BY-SA-4.0 should [not be used for software](https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software). +[CC0-1.0](/licenses/cc0-1.0/), [CC-BY-4.0](/licenses/cc-by-4.0/), and [CC-BY-SA-4.0](/licenses/cc-by-sa-4.0/) are [open](https://opendefinition.org) licenses used for non-software material ranging from datasets to videos. Note that Creative Commons does [not recommond its licenses be used for software](https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software) or hardware. ### Documentation @@ -20,12 +20,8 @@ The [SIL Open Font License 1.1](/licenses/ofl-1.1/) keeps fonts open, allowing t ### Hardware -There are the CERN Open Hardware family of licenses: [CERN-OHL-P-2.0](/licenses/cern-ohl-p-2.0/), the permissive variant ([MIT](/licenses/mit/)-like); [CERN-OHL-W-2.0](/licenses/cern-ohl-w-2.0/), the “weakly reciprocal” variant ([MPL](/licenses/mpl-2.0/)-like), and [CERN-OHL-S-2.0](/licenses/cern-ohl-s-2.0/), the “strongly reciprocal” variant ([GPL](/licenses/gpl-3.0/)-like). The CERN OHL family is also applicable to HDL source code and synthesized bitstreams as would be used in FPGAs. - -[CC-BY-4.0](/licenses/cc-by-4.0/) and [CC-BY-SA-4.0](/licenses/cc-by-sa-4.0/) are also commonly used for hardware; however they do not grant patent rights which can restrict usage of patent-encumbered hardware licensed under them and Creative Commons does not recommend them for hardware. - -If your hardware has accompanying software then be sure to specify a license for the software portion as well as the hardware portion. +Designs for [open source hardware](https://www.oshwa.org/definition/) ranging from furniture to [FGPAs](https://www.oshwa.org/best-practices-for-sharing-fpga-designs-2/) are covered by CERN Open Hardware licenses: [CERN-OHL-P-2.0](/licenses/cern-ohl-p-2.0/) (permissive), [CERN-OHL-W-2.0](/licenses/cern-ohl-w-2.0/) (weakly reciprocal), and [CERN-OHL-S-2.0](/licenses/cern-ohl-s-2.0/) (strongly reciprocal). ### Mixed projects -If your project contains a mix of software and other material, you can include multiple licenses, as long as you are explicit about which license applies to each part of the project. See [the license notice for this site](https://github.com/github/choosealicense.com#license) as an example. +If your project contains a mix of different types of material, you can include multiple licenses, as long as you are explicit about which license applies to each part of the project. See [the license notice for this site](https://github.com/github/choosealicense.com#license) as an example.