From 570df49361168371670706214f9d3090dd036793 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 12 Jan 2019 16:19:34 -0800 Subject: [PATCH 1/2] Adding a license docs: more consistent phrasing, license text should match SPDX's data Adding https://github.com/github/choosealicense.com/pull/195#issuecomment-453790951 to documenation --- CONTRIBUTING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cc487c3..2f01abd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -21,8 +21,8 @@ Choosealicense.com is intended to demystify license choices, not present or cata * [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*) * [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 -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 +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. 3 notable projects using the license must be identified. These must have 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: @@ -32,7 +32,7 @@ If your proposed license meets the above criteria, here's a few other things to * Each license has both [required and optional metadata](https://github.com/github/choosealicense.com#license-metadata) that should be included. * The text of the license should be wrapped to a 78 character width. * The text of the license should match the corresponding text found at https://spdx.org/licenses/ -* 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. Further, this text should be the same as the plain text version of the license 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. ## Making Changes From 6c6ca6c29e3b9241e9c3590c19d6c6b767da6889 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 12 Jan 2019 16:22:49 -0800 Subject: [PATCH 2/2] Replace existing SPDX match with more explicit instruction It was already mentioned! --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2f01abd..4ad2b89 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -31,8 +31,8 @@ If your proposed license meets the above criteria, here's a few other things to * 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. * The text of the license should be wrapped to a 78 character width. -* The text of the license should match the corresponding text found at https://spdx.org/licenses/ -* The body of the file should be the text of the license in plain text. Further, this text should be the same as the plain text version of the license 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. ## Making Changes