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

Merge pull request #587 from github/https-misc

http->https for misc links outside of license texts
This commit is contained in:
Mike Linksvayer 2018-05-22 13:55:52 -07:00 committed by GitHub
commit 588b2f4a0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 21 additions and 21 deletions

View File

@ -10,23 +10,23 @@ Please note that this project is released with a [Contributor Code of Conduct](C
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
[this site is all about](http://choosealicense.com/about). Its not a comprehensive list of all possible licenses. [this site is all about](https://choosealicense.com/about). Its not a comprehensive list of all possible licenses.
## Adding a license ## Adding a license
Choosealicense.com is intended to demystify license choices, not present or catalog all of them. As such, only a small number are highlighted on the home page or <http://choosealicense.com/licenses>, and there are several requirements for a license to be [cataloged](http://choosealicense.com/appendix/) on the site: Choosealicense.com is intended to demystify license choices, not present or catalog all of them. As such, only a small number are highlighted on the home page or <https://choosealicense.com/licenses>, and there are several requirements for a license to be [cataloged](https://choosealicense.com/appendix/) on the site:
1. The license must have [an SPDX identifier](https://spdx.org/licenses/). If your license isn't registered with SPDX, please [request that it be added](https://spdx.org/spdx-license-list/request-new-license). 1. The license must have [an SPDX identifier](https://spdx.org/licenses/). If your license isn't registered with SPDX, please [request that it be added](https://spdx.org/spdx-license-list/request-new-license).
2. The license must be listed on one of the following approved lists of licenses: 2. The license must be listed on one of the following approved lists of licenses:
* [List of OSI approved licenses](https://opensource.org/licenses/alphabetical) * [List of OSI approved licenses](https://opensource.org/licenses/alphabetical)
* [GNU's list of free licenses](https://www.gnu.org/licenses/license-list.en.html) (*note: the license must be listed in one of the three "free" categories*) * [GNU's list of free licenses](https://www.gnu.org/licenses/license-list.en.html) (*note: the license must be listed in one of the three "free" categories*)
* [Open Definition's list of conformant licenses](http://opendefinition.org/licenses/) (non-code) * [Open Definition's list of conformant licenses](https://opendefinition.org/licenses/) (non-code)
3. A [GitHub code search](https://github.com/search?q=MIT+filename%3ALICENSE&type=Code) must reveal at least *1,000* public repositories using the license 3. A [GitHub code search](https://github.com/search?q=MIT+filename%3ALICENSE&type=Code) must reveal at least *1,000* public repositories using the license
4. Identification of 3 notable projects using the license with straightforward LICENSE files which serve as examples newcomers can follow and that could be detected by [licensee](https://github.com/benbalter/licensee) if it knew about the license 4. Identification of 3 notable projects using the license with straightforward LICENSE files which serve as examples newcomers can follow and that could be detected by [licensee](https://github.com/benbalter/licensee) if it knew about the license
If your proposed license meets the above criteria, here's a few other things to keep in mind as you propose the license's addition: If your proposed license meets the above criteria, here's a few other things to keep in mind as you propose the license's addition:
* Is the license already cataloged? See <http://choosealicense.com/appendix/> for a list of all of the licenses known by the site. * Is the license already cataloged? See <https://choosealicense.com/appendix/> for a list of all of the licenses known by the site.
* Licenses live in the `/_licenses` folder. * Licenses live in the `/_licenses` folder.
* The license files should be in the format of `_licenses/[lowercased-spdx-id].txt` (e.g., `_licenses/mit.txt`) * The license files should be in the format of `_licenses/[lowercased-spdx-id].txt` (e.g., `_licenses/mit.txt`)
* Each license has both [required and optional metadata](https://github.com/github/choosealicense.com#license-metadata) that should be included. * Each license has both [required and optional metadata](https://github.com/github/choosealicense.com#license-metadata) that should be included.

View File

@ -8,7 +8,7 @@ Like a Choose Your Own Adventure site, but only much less interesting.
A lot of repositories on GitHub.com don't have a license. GitHub provides a license chooser, but if you don't know anything about licenses, how are you supposed to make an informed decision? A lot of repositories on GitHub.com don't have a license. GitHub provides a license chooser, but if you don't know anything about licenses, how are you supposed to make an informed decision?
[ChooseALicense.com](http://www.choosealicense.com "Choose A Licence website") is designed to help people make an informed decision about licenses by demystifying license choices through non-judgmental guidance. [ChooseALicense.com](https://www.choosealicense.com "Choose A Licence website") is designed to help people make an informed decision about licenses by demystifying license choices through non-judgmental guidance.
## Immediate Goals ## Immediate Goals
@ -39,8 +39,8 @@ Licenses sit in the `/_licenses` folder. Each license has YAML front matter desc
#### Required fields #### Required fields
* `title` - The license full name specified by http://spdx.org/licenses/ * `title` - The license full name specified by https://spdx.org/licenses/
* `spdx-id` - Short identifier specified by http://spdx.org/licenses/ * `spdx-id` - Short identifier specified by https://spdx.org/licenses/
* `source` - The URL to the license source text * `source` - The URL to the license source text
* `description` - A human-readable description of the license * `description` - A human-readable description of the license
* `how` - Instructions on how to implement the license * `how` - Instructions on how to implement the license
@ -52,7 +52,7 @@ Licenses sit in the `/_licenses` folder. Each license has YAML front matter desc
#### Optional fields #### Optional fields
* `featured` - Whether the license should be featured on the main page (defaults to false) * `featured` - Whether the license should be featured on the main page (defaults to false)
* `hidden` - Whether the license is neither [popular](https://opensource.org/licenses) nor fills out the [spectrum of licenses](http://choosealicense.com/licenses/) from strongly conditional to unconditional (defaults to true) * `hidden` - Whether the license is neither [popular](https://opensource.org/licenses) nor fills out the [spectrum of licenses](https://choosealicense.com/licenses/) from strongly conditional to unconditional (defaults to true)
* `nickname` - Customary short name if applicable (e.g, GPLv3) * `nickname` - Customary short name if applicable (e.g, GPLv3)
* `note` - Additional information about the licenses * `note` - Additional information about the licenses
* `redirect_from` - Relative path(s) to redirect to the license from, to prevent breaking old URLs * `redirect_from` - Relative path(s) to redirect to the license from, to prevent breaking old URLs
@ -104,4 +104,4 @@ The license properties (rules) are stored as a bulleted list within the licenses
## License ## License
The content of this project itself is licensed under the [Creative Commons Attribution 3.0 license](http://creativecommons.org/licenses/by/3.0/us/deed.en_US), and the underlying source code used to format and display that content is licensed under the [MIT license](http://opensource.org/licenses/mit-license.php). The content of this project itself is licensed under the [Creative Commons Attribution 3.0 license](https://creativecommons.org/licenses/by/3.0/us/deed.en_US), and the underlying source code used to format and display that content is licensed under the [MIT license](https://opensource.org/licenses/mit-license.php).

View File

@ -2,11 +2,11 @@
# The available fields are: # The available fields are:
- name: title - name: title
description: The license full name specified by http://spdx.org/licenses/ description: The license full name specified by https://spdx.org/licenses/
required: true required: true
- name: spdx-id - name: spdx-id
description: Short identifier specified by http://spdx.org/licenses/ description: Short identifier specified by https://spdx.org/licenses/
required: true required: true
- name: source - name: source
@ -44,7 +44,7 @@
required: false required: false
- name: hidden - name: hidden
description: Whether the license is neither [popular](https://opensource.org/licenses) nor fills out the [spectrum of licenses](http://choosealicense.com/licenses/) from strongly conditional to unconditional (defaults to true) description: Whether the license is neither [popular](https://opensource.org/licenses) nor fills out the [spectrum of licenses](https://choosealicense.com/licenses/) from strongly conditional to unconditional (defaults to true)
required: false required: false
- name: nickname - name: nickname

View File

@ -14,7 +14,7 @@
{% 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="http://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 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>
</div> </div>
{% if page.source %} {% if page.source %}

View File

@ -2,7 +2,7 @@
title: Artistic License 2.0 title: Artistic License 2.0
spdx-id: Artistic-2.0 spdx-id: Artistic-2.0
redirect_from: /licenses/artistic/ redirect_from: /licenses/artistic/
source: http://www.perlfoundation.org/attachment/legal/artistic-2_0.txt source: https://spdx.org/licenses/Artistic-2.0.html
description: Heavily favored by the Perl community, the Artistic license requires that modified versions of the software do not prevent users from running the standard version. description: Heavily favored by the Perl community, the Artistic license requires that modified versions of the software do not prevent users from running the standard version.

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](http://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](https://www.boost.org/users/license.html#FAQ).
using: using:

View File

@ -1,7 +1,7 @@
--- ---
title: European Union Public License 1.2 title: European Union Public License 1.2
spdx-id: EUPL-1.2 spdx-id: EUPL-1.2
source: http://eur-lex.europa.eu/legal-content/TXT/?uri=CELEX%3A32017D0863 source: https://eur-lex.europa.eu/legal-content/TXT/?uri=CELEX%3A32017D0863
description: The European Union Public Licence (EUPL) is a copyleft free/open source software license created on the initiative of and approved by the European Commission in 22 official languages of the European Union. description: The European Union Public Licence (EUPL) is a copyleft free/open source software license created on the initiative of and approved by the European Commission in 22 official languages of the European Union.

View File

@ -7,7 +7,7 @@ description: OSL 3.0 is a copyleft license that does not require reciprocal lice
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. Files licensed under OSL 3.0 must also include the notice "Licensed under the Open Software License version 3.0" adjacent to the copyright notice. 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. Files licensed under OSL 3.0 must also include the notice "Licensed under the Open Software License version 3.0" adjacent to the copyright notice.
note: OSL 3.0's author has <a href="http://rosenlaw.com/OSL3.0-explained.htm">provided an explanation</a> behind the creation of the license. note: OSL 3.0's author has <a href="https://rosenlaw.com/OSL3.0-explained.htm">provided an explanation</a> behind the creation of the license.
using: using:
- appserver.io: https://github.com/appserver-io/appserver/blob/master/LICENSE.txt - appserver.io: https://github.com/appserver-io/appserver/blob/master/LICENSE.txt

View File

@ -8,7 +8,7 @@ Open source software licenses can be used for non-software works, and often are
### Data, media, etc. ### 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](http://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 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).
### Documentation ### Documentation

View File

@ -7,7 +7,7 @@ describe 'byte order marks' do
context "the #{File.basename(file, '.txt')} license" do context "the #{File.basename(file, '.txt')} license" do
it 'does not begin with a byte order mark' do it 'does not begin with a byte order mark' do
bom = File.open(file).read.start_with?("\u0000EF\u0000BB\u0000BF") bom = File.open(file).read.start_with?("\u0000EF\u0000BB\u0000BF")
msg = 'License file begins with a Byte Order Mark. See http://stackoverflow.com/a/1068700.' msg = 'License file begins with a Byte Order Mark. See https://stackoverflow.com/a/1068700.'
expect(bom).to eql(false), msg expect(bom).to eql(false), msg
end end
end end

View File

@ -116,7 +116,7 @@ end
def od_approved_licenses def od_approved_licenses
SpecHelper.od_approved_licenses ||= begin SpecHelper.od_approved_licenses ||= begin
url = 'http://licenses.opendefinition.org/licenses/groups/od.json' url = 'https://licenses.opendefinition.org/licenses/groups/od.json'
data = OpenURI.open_uri(url).read data = OpenURI.open_uri(url).read
data = JSON.parse(data) data = JSON.parse(data)
licenses = {} licenses = {}