From 0ca4cd29485e696e7b83d49caca721a0163eee31 Mon Sep 17 00:00:00 2001 From: Sindre Sorhus Date: Sat, 30 May 2015 17:30:51 +0200 Subject: [PATCH] fix license ambiguity --- license | 21 --------------------- package.json | 2 +- readme.md | 2 +- 3 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 license diff --git a/license b/license deleted file mode 100644 index 21b6fa5b..00000000 --- a/license +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) Yeoman - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/package.json b/package.json index 7c7fadb1..7c4ad99b 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "yo", "version": "1.4.6", "description": "CLI tool for running Yeoman generators", - "license": "BSD", + "license": "BSD-2-Clause", "bin": "lib/cli.js", "author": "Yeoman", "repository": "yeoman/yo", diff --git a/readme.md b/readme.md index 60ab5c61..048990e5 100644 --- a/readme.md +++ b/readme.md @@ -48,4 +48,4 @@ See the [release page](https://github.com/yeoman/yo/releases). ## License -[BSD license](http://opensource.org/licenses/bsd-license.php) and copyright Google. +BSD-2-Clause © Google