From a470d9d6e881c81f2e4f0661779065f6bd5d2be5 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 21 Sep 2015 10:42:40 -0400 Subject: [PATCH] Correct DJRF/DJRF-mongoengine licenses, rename qsstats license to match pkg name. --- ...o-qsstats.txt => django-qsstats-magic.txt} | 0 .../django-rest-framework-mongoengine.txt | 21 +++++++++++ docs/licenses/django-rest-framework.txt | 37 ++++++++++--------- 3 files changed, 41 insertions(+), 17 deletions(-) rename docs/licenses/{django-qsstats.txt => django-qsstats-magic.txt} (100%) create mode 100644 docs/licenses/django-rest-framework-mongoengine.txt diff --git a/docs/licenses/django-qsstats.txt b/docs/licenses/django-qsstats-magic.txt similarity index 100% rename from docs/licenses/django-qsstats.txt rename to docs/licenses/django-qsstats-magic.txt diff --git a/docs/licenses/django-rest-framework-mongoengine.txt b/docs/licenses/django-rest-framework-mongoengine.txt new file mode 100644 index 0000000000..d7a92e58f1 --- /dev/null +++ b/docs/licenses/django-rest-framework-mongoengine.txt @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2014 Umut Bozkurt + +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 diff --git a/docs/licenses/django-rest-framework.txt b/docs/licenses/django-rest-framework.txt index d7a92e58f1..a1537be1b9 100644 --- a/docs/licenses/django-rest-framework.txt +++ b/docs/licenses/django-rest-framework.txt @@ -1,21 +1,24 @@ -The MIT License (MIT) +License -Copyright (c) 2014 Umut Bozkurt +Copyright (c) 2011-2015, Tom Christie 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 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. 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. -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 +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 HOLDER 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.