From 43f355b2819747a1c5d83e0a7debbb0815e73036 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 9 Jul 2022 12:33:02 -0700 Subject: [PATCH] fix note field for CERN OHL licenses (unintentionally a dictionary value), simplify rendering of field --- _includes/sidebar.html | 4 ++-- _licenses/apache-2.0.txt | 2 +- _licenses/bsl-1.0.txt | 2 +- _licenses/cern-ohl-p-2.0.txt | 3 +-- _licenses/cern-ohl-s-2.0.txt | 3 +-- _licenses/cern-ohl-w-2.0.txt | 3 +-- _licenses/eupl-1.1.txt | 2 +- 7 files changed, 8 insertions(+), 11 deletions(-) diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 8928950..9751d97 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -15,13 +15,13 @@

How to apply this license

- {{ page.how | markdownify | remove: '

' | remove: '

' }} + {{ page.how }}

Optional steps

{% if page.note %}

- {{ page.note | markdownify | remove: '

' | remove: '

' }} + {{ page.note }}

{% endif %} {% assign xgpl = false %} diff --git a/_licenses/apache-2.0.txt b/_licenses/apache-2.0.txt index 647ce4c..9b2c569 100644 --- a/_licenses/apache-2.0.txt +++ b/_licenses/apache-2.0.txt @@ -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. -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 recommends 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: Kubernetes: https://github.com/kubernetes/kubernetes/blob/master/LICENSE diff --git a/_licenses/bsl-1.0.txt b/_licenses/bsl-1.0.txt index 8b79559..4cdf0f0 100644 --- a/_licenses/bsl-1.0.txt +++ b/_licenses/bsl-1.0.txt @@ -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. -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 Boost Software License FAQ. using: Boost: https://github.com/boostorg/boost/blob/master/LICENSE_1_0.txt diff --git a/_licenses/cern-ohl-p-2.0.txt b/_licenses/cern-ohl-p-2.0.txt index 86d6613..2e31afa 100644 --- a/_licenses/cern-ohl-p-2.0.txt +++ b/_licenses/cern-ohl-p-2.0.txt @@ -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. -note: - CERN recommends 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 recommends 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 diff --git a/_licenses/cern-ohl-s-2.0.txt b/_licenses/cern-ohl-s-2.0.txt index 136fb24..b0c2578 100644 --- a/_licenses/cern-ohl-s-2.0.txt +++ b/_licenses/cern-ohl-s-2.0.txt @@ -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. -note: - CERN recommends 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 recommends 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 diff --git a/_licenses/cern-ohl-w-2.0.txt b/_licenses/cern-ohl-w-2.0.txt index f9b8082..f5c0dee 100644 --- a/_licenses/cern-ohl-w-2.0.txt +++ b/_licenses/cern-ohl-w-2.0.txt @@ -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. -note: - CERN recommends 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 recommends 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 diff --git a/_licenses/eupl-1.1.txt b/_licenses/eupl-1.1.txt index c174eb0..dfb9a28 100644 --- a/_licenses/eupl-1.1.txt +++ b/_licenses/eupl-1.1.txt @@ -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. -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 boilerplate notice to the top of each file. using: