From f1cbe2430b4c0d447d92d05394f66c118d6b335b Mon Sep 17 00:00:00 2001 From: nodiscc Date: Fri, 2 Sep 2016 19:49:09 +0200 Subject: [PATCH] merge bsd-2clause/3clause licenses do not differentiate BSD licenses. We don't know whether previous entries are under BSD-2 or 3. The only difference is: > 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e2230e1f..492e65c7 100644 --- a/README.md +++ b/README.md @@ -723,7 +723,7 @@ See https://github.com/n1trux/awesome-sysadmin#monitoring and https://github.com * [Phaste](https://pste.pw) - A Phalcon-based, MySQL pastebin application with privacy-respecting Piwik integration and syntax highlighting. ([Source Code](https://github.com/FoxDev/Phaste)) `AGPLv3` `PHP` * [PrivateBin](https://privatebin.info/) - PrivateBin is a minimalist, opensource online pastebin/discussion board where the server has zero knowledge of hosted data. ([Demo](https://privatebin.net/), [Source Code](https://github.com/PrivateBin/PrivateBin)) `Zlib` `PHP` * [snipt](https://snipt.net/) - Long-term memory for coders. Share and store code snippets. ([Source Code](https://github.com/nicksergeant/snipt/)) `BSD` `Python` - * [Sticky Notes](http://sayakb.github.io/sticky-notes/) - A powerful open-source pastebin application for effortless code sharing. ([Source Code](https://github.com/sayakb/sticky-notes)) `BSD2C` `PHP` + * [Sticky Notes](http://sayakb.github.io/sticky-notes/) - A powerful open-source pastebin application for effortless code sharing. ([Source Code](https://github.com/sayakb/sticky-notes)) `BSD` `PHP` * [Stikked](https://github.com/claudehohl/Stikked) - An advanced and beautiful pastebin. `GPLv3` `PHP` * [tastebin](https://github.com/andreineculau/tastebin) - Updated version of hastebin plus additional features. `Apache` `Nodejs` @@ -986,8 +986,7 @@ See also [Documentation Generators](#documentation-generators), [Wikimatrix](htt * `Apache` - [Apache, Version 2.0](http://www.apache.org/licenses/) * `ARTv2` - [Artistic License Version 2.0](http://opensource.org/licenses/Artistic-2.0) * `Beerware` - [Beerware License](https://spdx.org/licenses/Beerware.html) - * `BSD` - [FreeBSD License](https://www.freebsd.org/copyright/license.html) - * `BSD2C` - [BSD 2-Clause License](https://opensource.org/licenses/bsd-license.php) + * `BSD` - [BSD 2-Clause](https://opensource.org/licenses/BSD-3-Clause) or [BSD 3-Clause](https://opensource.org/licenses/BSD-3-Clause) license * `CCBYNCSAv2` - [Creative Commons Attribution-NonCommercial-ShareAlike 2.0](https://creativecommons.org/licenses/by-nc-sa/2.0/) * `CCBYNCSAv3` - [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported](https://creativecommons.org/licenses/by-nc-sa/3.0/) * `CCBYNCv4` - [Creative Commons Attribution-NonCommercial 4.0 International](https://creativecommons.org/licenses/by-nc/4.0/)