docs/choosealicense.com
docs/choosealicense.com
1
0
Fork 0
mirror of https://github.com/github/choosealicense.com synced 2024-11-04 18:58:50 +01:00
Code Issues Releases Wiki Activity

Merge pull request #613 from github/gplcc

Browse Source 
add gplcc note to gpl-2.0 and lgpl-2.1 sidebars
This commit is contained in:
Mike Linksvayer 2018-10-22 10:58:59 -07:00 committed by GitHub
commit 2e1e498e7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
_includes/sidebar.html
View File

@ -15,14 +15,20 @@
<p> <p>
{{ page.how | markdownify | remove: '<p>' | remove: '</p>' }} {{ page.how | markdownify | remove: '<p>' | remove: '</p>' }}
</p> </p>
<div class="note">
<h4>Optional steps</h4>
{% if page.note %} {% if page.note %}
<p class="note"> <p>
<strong>Note: </strong> {{ page.note | markdownify | remove: '<p>' | remove: '</p>' }} {{ page.note | markdownify | remove: '<p>' | remove: '</p>' }}
</p> </p>
{% endif %} {% endif %}
{% assign xgpl = false %} {% assign xgpl = false %}
{% if page.spdx-id contains 'GPL' %}{% assign xgpl = true %}{% endif %} {% if page.spdx-id contains 'GPL' %}{% assign xgpl = true %}{% endif %}
<p class="note"><strong>Optional: </strong> Add <strong><code>{{ page.spdx-id }}{% if xgpl %}-or-later{% endif %}</code></strong>{% if xgpl %} (or <strong><code>{{ page.spdx-id }}-only</code></strong> to disallow future versions){% endif %} to your project's package description, if applicable (e.g., <a href="https://docs.npmjs.com/files/package.json#license">Node.js</a>, <a href="https://guides.rubygems.org/specification-reference/#license=">Ruby</a>, and <a href="https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata">Rust</a>). This will ensure the license is displayed in package directories.</p> <p>Add <strong><code>{{ page.spdx-id }}{% if xgpl %}-or-later{% endif %}</code></strong>{% if xgpl %} (or <strong><code>{{ page.spdx-id }}-only</code></strong> to disallow future versions){% endif %} to your project's package description, if applicable (e.g., <a href="https://docs.npmjs.com/files/package.json#license">Node.js</a>, <a href="https://guides.rubygems.org/specification-reference/#license=">Ruby</a>, and <a href="https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata">Rust</a>). This will ensure the license is displayed in package directories.</p>
{% if page.spdx-id contains 'GPL-2' %}
<p>If you would like your project to adopt the GPL-3.0's cure provision, add the <a href="https://github.com/gplcc/gplcc/blob/master/Project/COMMITMENT">text</a> of the <a href="https://gplcc.github.io/gplcc/">GPL Cooperation Commitment</a> to a file named <code>COMMITMENT</code> in the same directory as your {{ page.spdx-id }} license file.</p>
{% endif %}
</div>
</div> </div>
<div class="source"> <div class="source">