docs/choosealicense.com
docs/choosealicense.com
1
0
Fork 0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 04:40:09 +01:00
Code Issues Releases Wiki Activity

fix note field for CERN OHL licenses (unintentionally a dictionary value), simplify rendering of field

Browse Source
This commit is contained in:
Mike Linksvayer 2022-07-09 12:33:02 -07:00
parent 66a10061b9
commit 43f355b281
No known key found for this signature in database
GPG Key ID: 136DBD194F0080CF
7 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_includes/sidebar.html
View File

@ -15,13 +15,13 @@
<div class="how-to-apply"> <div class="how-to-apply">
<h3 id="how-to-apply">How to apply this license</h3> <h3 id="how-to-apply">How to apply this license</h3>
<p> <p>
{{ page.how | markdownify | remove: '<p>' | remove: '</p>' }} {{ page.how }}
</p> </p>
<div class="note"> <div class="note">
<h4 id="optional-steps">Optional steps</h4> <h4 id="optional-steps">Optional steps</h4>
{% if page.note %} {% if page.note %}
<p> <p>
{{ page.note | markdownify | remove: '<p>' | remove: '</p>' }} {{ page.note }}
</p> </p>
{% endif %} {% endif %}
{% assign xgpl = false %} {% assign xgpl = false %}

2
_licenses/apache-2.0.txt
View File

@ -9,7 +9,7 @@ description: A permissive license whose main conditions require preservation of
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. 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: The Apache Software Foundation [recommends](https://apache.org/foundation/license-faq.html#Apply-My-Software) taking the additional step of adding a boilerplate notice to the header of each source file. You can find the notice in the appendix at the very end of the license text. note: The Apache Software Foundation <a href="https://apache.org/foundation/license-faq.html#Apply-My-Software">recommends</a> taking the additional step of adding a boilerplate notice to the header of each source file. You can find the notice in the appendix at the very end of the license text.
using: using:
Kubernetes: https://github.com/kubernetes/kubernetes/blob/master/LICENSE Kubernetes: https://github.com/kubernetes/kubernetes/blob/master/LICENSE

2
_licenses/bsl-1.0.txt
View File

@ -7,7 +7,7 @@ description: A simple permissive license only requiring preservation of copyrigh
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. 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: Boost recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the [Boost Software License FAQ](https://www.boost.org/users/license.html#FAQ). note: Boost recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the <a href="https://www.boost.org/users/license.html#FAQ">Boost Software License FAQ</a>.
using: using:
Boost: https://github.com/boostorg/boost/blob/master/LICENSE_1_0.txt Boost: https://github.com/boostorg/boost/blob/master/LICENSE_1_0.txt

3
_licenses/cern-ohl-p-2.0.txt
View File

@ -7,8 +7,7 @@ description: A permissive license for hardware designs, with conditions only req
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. 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: 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.'
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: using:
tedium: https://github.com/jboone/tedium/blob/master/LICENSE-CERN-OHL-P-v2 tedium: https://github.com/jboone/tedium/blob/master/LICENSE-CERN-OHL-P-v2

3
_licenses/cern-ohl-s-2.0.txt
View File

@ -7,8 +7,7 @@ description: Permissions of this strongly reciprocal license for hardware design
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. 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: 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.'
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: using:
USB Armory: https://github.com/f-secure-foundry/usbarmory/blob/master/hardware/mark-two/LICENSE USB Armory: https://github.com/f-secure-foundry/usbarmory/blob/master/hardware/mark-two/LICENSE

3
_licenses/cern-ohl-w-2.0.txt
View File

@ -7,8 +7,7 @@ description: Permissions of this weakly-reciprocal license are conditioned on ma
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. 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: 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.'
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: using:
Simple PCIe FMC carrier: https://ohwr.org/project/spec/blob/master/LICENSES/CERN-OHL-W-2.0.txt Simple PCIe FMC carrier: https://ohwr.org/project/spec/blob/master/LICENSES/CERN-OHL-W-2.0.txt

2
_licenses/eupl-1.1.txt
View File

@ -7,7 +7,7 @@ description: The “European Union Public Licence” (EUPL) is a copyleft free/o
how: Create a text file (typically named COPYING or LICENCE.txt) in the root of your source code and copy the text of the license into the file. how: Create a text file (typically named COPYING or LICENCE.txt) in the root of your source code and copy the text of the license into the file.
note: The European Commission recommends taking the additional step of adding a [boilerplate notice](https://joinup.ec.europa.eu/sites/default/files/inline-files/EUPL%201_1%20Guidelines%20EN%20Joinup.pdf#page=17) to the top of each file. note: The European Commission recommends taking the additional step of adding a <a href="https://joinup.ec.europa.eu/sites/default/files/inline-files/EUPL%201_1%20Guidelines%20EN%20Joinup.pdf#page=17">boilerplate notice</a> to the top of each file.
using: using: