From 9a04ddd50371e17b469da0a85aec021da7620d1e Mon Sep 17 00:00:00 2001 From: Jeff Conniff Date: Thu, 26 Feb 2015 12:03:41 -0800 Subject: [PATCH] Adding/updating license info --- LICENSE | 43 ++++++++++++++++++++++++++++--------------- README.md | 3 +-- index.js | 6 ++++++ package.json | 6 ++++++ 4 files changed, 41 insertions(+), 17 deletions(-) diff --git a/LICENSE b/LICENSE index 16fcb18..58708e7 100644 --- a/LICENSE +++ b/LICENSE @@ -1,18 +1,31 @@ -Copyright (c) 2013 by Eric Ferraiuolo (eferraiuolo@gmail.com). All rights reserved. +Copyright (c) 2014, Yahoo Inc. All rights reserved. -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: +Redistribution and use of this software in source and binary forms, +with or without modification, are permitted provided that the following +conditions are met: -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. +* Redistributions of source code must retain the above + copyright notice, this list of conditions and the + following disclaimer. -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. +* Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the + following disclaimer in the documentation and/or other + materials provided with the distribution. + +* Neither the name of Yahoo Inc. nor the names of its + contributors may be used to endorse or promote products + derived from this software without specific prior + written permission of Yahoo Inc. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/README.md b/README.md index 18400dc..c3a1fa9 100644 --- a/README.md +++ b/README.md @@ -88,8 +88,7 @@ when someone navigates to `/about/people/`, they'll be redirected to License ------- -This software is free to use under the MIT license. -See the [LICENSE file][] for license text and copyright information. +Code licensed under the BSD license. See [LICENSE file][] file for terms. [LICENSE file]: https://github.com/ericf/express-slash/blob/master/LICENSE diff --git a/index.js b/index.js index 777d6bb..7c5a704 100644 --- a/index.js +++ b/index.js @@ -1,3 +1,9 @@ +/* + * Copyright (c) 2014, Yahoo Inc. All rights reserved. + * Copyrights licensed under the New BSD License. + * See the accompanying LICENSE file for terms. + */ + 'use strict'; var parseURL = require('url').parse; diff --git a/package.json b/package.json index 8e8603e..992cc1b 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,12 @@ "name": "express-slash", "description": "Express middleware for people who are anal about trailing slashes.", "version": "2.0.1", + "licenses": [ + { + "type" : "BSD", + "url" : "https://github.com/ericf/express-slash/blob/master/LICENSE" + } + ], "homepage": "https://github.com/ericf/express-slash", "keywords": [ "express",