From 26e33532be401110e1e26c2eca1d0a5d95247380 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Sat, 9 Sep 2017 14:40:43 +0200 Subject: [PATCH] add license documents --- LICENSE | 47 +++++------------------------------------------ LICENSE-content | 5 +++++ LICENSE-photos | 7 +++++++ README.md | 24 ++---------------------- 4 files changed, 19 insertions(+), 64 deletions(-) create mode 100644 LICENSE-content create mode 100644 LICENSE-photos diff --git a/LICENSE b/LICENSE index 0b147c72..fc487c46 100644 --- a/LICENSE +++ b/LICENSE @@ -1,46 +1,9 @@ ---------------- -Posts ---------------- +MIT License -All post content under `_src/_posts` is licensed under a -Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International -License. -http://creativecommons.org/licenses/by-nc-sa/4.0/ +Copyright (c) 2008-2017 Matthias Kretschmann ---------------- -Photos & images ---------------- +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: -All photos & image assets under `_src/_media`, `_src/assets/img`, and -`assets sheet.psd` are plain ol' copyright. +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -Copyright (c) 2008–2014 Matthias Kretschmann - -Don't care if you fork & play with it, but you're not allowed to publish -anything from it as a whole without my written permission. - ---------------- -Everything else ---------------- - -The MIT License (MIT) - -Copyright (c) 2008–2014 Matthias Kretschmann - -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. \ No newline at end of file +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/LICENSE-content b/LICENSE-content new file mode 100644 index 00000000..ac50ae93 --- /dev/null +++ b/LICENSE-content @@ -0,0 +1,5 @@ +All post content under `_src/_posts` is licensed under a +Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International +License. + +http://creativecommons.org/licenses/by-nc-sa/4.0/. diff --git a/LICENSE-photos b/LICENSE-photos new file mode 100644 index 00000000..d789f81c --- /dev/null +++ b/LICENSE-photos @@ -0,0 +1,7 @@ +All photos & image assets under `_src/_media`, `_src/assets/img`, and +`assets sheet.psd` are plain ol' copyright. + +Copyright (c) 2008–2017 Matthias Kretschmann + +Don't care if you fork & play with it, but you're not allowed to publish +anything from it as a whole without my written permission. diff --git a/README.md b/README.md index 9fb1ce40..5142626b 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ kremalicious3 > [kremalicious.com](http://kremalicious.com) based on [Jekyll](http://jekyllrb.com). Neat. [![Build Status](https://travis-ci.org/kremalicious/kremalicious3.svg?branch=master)](https://travis-ci.org/kremalicious/kremalicious3) -[![Dependency Status](https://gemnasium.com/kremalicious/kremalicious3.svg)](https://gemnasium.com/kremalicious/kremalicious3) +[![Dependency Status](https://gemnasium.com/kremalicious/kremalicious3.svg)](https://gemnasium.com/kremalicious/kremalicious3) [![Greenkeeper badge](https://badges.greenkeeper.io/kremalicious/kremalicious3.svg)](https://greenkeeper.io/) @@ -67,30 +67,10 @@ Licenses All photos & image assets under `_src/_media`, `_src/assets/img`, and `assets sheet.psd` are plain ol' copyright. -Copyright (c) 2008–2014 Matthias Kretschmann +Copyright (c) 2008–2017 Matthias Kretschmann Don't care if you fork & play with it, but you're not allowed to publish anything from it as a whole without my written permission. ### Everything else The MIT License (MIT) - -Copyright (c) 2008–2014 Matthias Kretschmann - -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.