1
0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 12:50:24 +01:00

Merge pull request #784 from waldyrious/capitalization-punctuation

Capitalization, punctuation and spelling fixes
This commit is contained in:
Mike Linksvayer 2020-11-14 14:50:05 -08:00 committed by GitHub
commit 50e1c11054
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 12 deletions

View File

@ -1,4 +1,4 @@
# How to Contribute # How to contribute
We love Pull Requests! Your contributions help make ChooseALicense.com great. We love Pull Requests! Your contributions help make ChooseALicense.com great.
@ -6,7 +6,7 @@ Contributions to this project are [released](https://help.github.com/articles/gi
Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms. Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.
## Getting Started ## Getting started
So you want to contribute to ChooseALicense. Great! We welcome any help we can So you want to contribute to ChooseALicense. Great! We welcome any help we can
get. But first, please make sure you understand what get. But first, please make sure you understand what
@ -34,7 +34,7 @@ If your proposed license meets the above criteria, here's a few other things to
* The text of the license should match the corresponding text found in [spdx/license-list-data](https://github.com/spdx/license-list-data/blob/master/text/). If there are errors there, please fix them in [spdx/license-list-XML](https://github.com/spdx/license-list-XML) (from which the plain text version is generated) so as to minimize license text variation and make it easier for choosealicense.com to eventually consume license texts directly from SPDX. * The text of the license should match the corresponding text found in [spdx/license-list-data](https://github.com/spdx/license-list-data/blob/master/text/). If there are errors there, please fix them in [spdx/license-list-XML](https://github.com/spdx/license-list-XML) (from which the plain text version is generated) so as to minimize license text variation and make it easier for choosealicense.com to eventually consume license texts directly from SPDX.
* The body of the file should be the text of the license in plain text. * The body of the file should be the text of the license in plain text.
## Making Changes ## Making changes
The easiest way to make a change is to simply edit a file from your browser. The easiest way to make a change is to simply edit a file from your browser.
When you click the edit button, it will fork the repository under your account. When you click the edit button, it will fork the repository under your account.

View File

@ -12,7 +12,7 @@ We catalog [select](CONTRIBUTING.md#adding-a-license) open source licenses with
* Collaborate with and reinforce other licensing best practices and standards projects. * Collaborate with and reinforce other licensing best practices and standards projects.
* Not comprehensive. Seems like an odd goal, but there are a bajillion licenses out there. We're going to have to filter that down to a small list of those that matter. * Not comprehensive. Seems like an odd goal, but there are a bajillion licenses out there. We're going to have to filter that down to a small list of those that matter.
## Run It On Your Machine ## Run it on your machine
### Managing Dependencies ### Managing Dependencies

View File

@ -4,7 +4,7 @@
{% unless page.spdx-id == 'LGPL-3.0' %} {% unless page.spdx-id == 'LGPL-3.0' %}
<h3 id="suggest-this-license">Suggest this license</h3> <h3 id="suggest-this-license">Suggest this license</h3>
<div class="repository-suggestion"> <div class="repository-suggestion">
<p>Make a pull request to suggest this license for a project that is <a href="/no-permission/">not licensed</a>. Please be polite: see if a license has already been suggested, try to suggest a license fitting for the project's <a href="/community/">community</a>, and keep your communication with project maintainers friendly.</p> <p>Make a pull request to suggest this license for a project that is <a href="/no-permission/">not licensed</a>. Please be polite: see if a license has already been suggested, try to suggest a license fitting for the projects <a href="/community/">community</a>, and keep your communication with project maintainers friendly.</p>
<div class="input-wrapper"> <div class="input-wrapper">
<input type="text" data-license-id="{{ page.spdx-id }}" placeholder="Enter GitHub repository URL" id="repository-url" title="status" /> <input type="text" data-license-id="{{ page.spdx-id }}" placeholder="Enter GitHub repository URL" id="repository-url" title="status" />
<div class="status-indicator"></div> <div class="status-indicator"></div>
@ -26,9 +26,9 @@
{% 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 id="package-metadata">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 id="package-metadata">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 projects 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' %} {% if page.spdx-id contains 'GPL-2' %}
<p id="gplcc">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> <p id="gplcc">If you would like your project to adopt the GPL-3.0s 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 %} {% endif %}
</div> </div>
</div> </div>
@ -42,7 +42,7 @@
{% if page.using %} {% if page.using %}
<div class="projects-with-license"> <div class="projects-with-license">
<h3>Who's using this license?</h3> <h3>Whos using this license?</h3>
<ul> <ul>
{% for using in page.using %} {% for using in page.using %}
<li><a href="{{ using[1] }}" target="_blank">{{ using[0] }}</a></li> <li><a href="{{ using[1] }}" target="_blank">{{ using[0] }}</a></li>

View File

@ -6,7 +6,7 @@ title: Licenses
--- ---
<p>Open source licenses grant permission for anybody to use, modify, and share licensed software for any purpose, subject to conditions preserving the provenance and openness of the software. The following licenses are sorted by the number of conditions, from most (GNU AGPLv3) to none (Unlicense). Notice that the popular licenses featured on the <a href="/">home page</a> (GNU GPLv3 and MIT) fall within this spectrum.</p> <p>Open source licenses grant permission for anybody to use, modify, and share licensed software for any purpose, subject to conditions preserving the provenance and openness of the software. The following licenses are sorted by the number of conditions, from most (GNU AGPLv3) to none (Unlicense). Notice that the popular licenses featured on the <a href="/">home page</a> (GNU GPLv3 and MIT) fall within this spectrum.</p>
<p style="font-size:small; margin-bottom: 40px">If you're looking for a reference table of every license on choosealicense.com, see the <a href="/appendix">appendix</a>.</p> <p style="font-size:small; margin-bottom: 40px">If youre looking for a reference table of every license on choosealicense.com, see the <a href="/appendix">appendix</a>.</p>
{% include license-overview.html license-id="agpl-3.0" %} {% include license-overview.html license-id="agpl-3.0" %}
{% include license-overview.html license-id="gpl-3.0" %} {% include license-overview.html license-id="gpl-3.0" %}
@ -17,4 +17,4 @@ title: Licenses
{% include license-overview.html license-id="bsl-1.0" %} {% include license-overview.html license-id="bsl-1.0" %}
{% include license-overview.html license-id="unlicense" %} {% include license-overview.html license-id="unlicense" %}
The above licenses represent the entire spectrum of open source licenses, from highly protective to unconditional. One of these should work for most new open source projects. Many other open source licenses exist, including older versions of and close substitutes for some of the above. See the resources listed on our <a href="/about/">about page</a> if you'd like to read more. The above licenses represent the entire spectrum of open source licenses, from highly protective to unconditional. One of these should work for most new open source projects. Many other open source licenses exist, including older versions of and close substitutes for some of the above. See the resources listed on our <a href="/about/">about page</a> if youd like to read more.

View File

@ -18,6 +18,6 @@ Any open source software license or open license for media (see [above](#data-me
The [SIL Open Font License 1.1](/licenses/ofl-1.1/) keeps fonts open, allowing them to be freely used in other works. The [SIL Open Font License 1.1](/licenses/ofl-1.1/) keeps fonts open, allowing them to be freely used in other works.
### Mixed Projects ### 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 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.

View File

@ -27,7 +27,7 @@ The next few sections of these Terms go into greater detail on these disclaimers
### 4. DISCLAIMER OF WARRANTIES ### 4. DISCLAIMER OF WARRANTIES
TO THE FULLEST EXTENT PERMITTED BY APPLICABLE LAW, GITHUB OFFERS THE SITE ON AN AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WEBSITES OR SERVICES, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NONINFRINGEMENT. GITHUB DOES NOT WARRANT THAT THE FUNCTIONS OR CONTENT CONTAINED ON THE WEBSITE OR SERVICES WILL BE ERROR-FREE, THAT DEFECTS WILL BE CORRECTED, OR THAT GITHUB'S SERVERS ARE FREE OF VIRUSES OR OTHER HARMFUL COMPONENTS. GITHUB DOES NOT WARRANT OR MAKE ANY REPRESENTATION REGARDING USE OR THE RESULT OF USE OF THE CONTENT IN TERMS OF ACCURACY, RELIABILITY, OR OTHERWISE. TO THE FULLEST EXTENT PERMITTED BY APPLICABLE LAW, GITHUB OFFERS THE SITE ON AN AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WEBSITES OR SERVICES, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NONINFRINGEMENT. GITHUB DOES NOT WARRANT THAT THE FUNCTIONS OR CONTENT CONTAINED ON THE WEBSITE OR SERVICES WILL BE ERROR-FREE, THAT DEFECTS WILL BE CORRECTED, OR THAT GITHUB'S SERVERS ARE FREE OF VIRUSES OR OTHER HARMFUL COMPONENTS. GITHUB DOES NOT WARRANT OR MAKE ANY REPRESENTATION REGARDING USE OR THE RESULT OF USE OF THE CONTENT IN TERMS OF ACCURACY, RELIABILITY, OR OTHERWISE.
### 5. LIMITATION OF LIABILITY ### 5. LIMITATION OF LIABILITY