From 9aae44ef66306d70ea51c646f0c95d8308fec93a Mon Sep 17 00:00:00 2001 From: Peter Parente Date: Sun, 17 Jan 2016 10:11:48 -0500 Subject: [PATCH] Use updated LICENSE.md file Also fix copyright headers on various files --- LICENSE | 28 --------------- LICENSE.md | 60 +++++++++++++++++++++++++++++++++ all-spark-notebook/Dockerfile | 1 + datascience-notebook/Dockerfile | 2 ++ minimal-kernel/Dockerfile | 1 + minimal-notebook/Dockerfile | 1 + pyspark-notebook/Dockerfile | 1 + r-notebook/Dockerfile | 1 + scipy-notebook/Dockerfile | 1 + 9 files changed, 68 insertions(+), 28 deletions(-) delete mode 100644 LICENSE create mode 100644 LICENSE.md diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 43840d7833..0000000000 --- a/LICENSE +++ /dev/null @@ -1,28 +0,0 @@ -Copyright (c) 2015, Project Jupyter -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -* 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. - -* Neither the name of docker-stacks nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -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. - diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000000..bd6397d458 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,60 @@ +# Licensing terms + +This project is licensed under the terms of the Modified BSD License +(also known as New or Revised or 3-Clause BSD), as follows: + +- Copyright (c) 2001-2015, IPython Development Team +- Copyright (c) 2015-, Jupyter Development Team + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +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. + +Neither the name of the Jupyter Development Team nor the names of its +contributors may be used to endorse or promote products derived from this +software without specific prior written permission. + +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. + +## About the Jupyter Development Team + +The Jupyter Development Team is the set of all contributors to the Jupyter project. +This includes all of the Jupyter subprojects. + +The core team that coordinates development on GitHub can be found here: +https://github.com/jupyter/. + +## Our Copyright Policy + +Jupyter uses a shared copyright model. Each contributor maintains copyright +over their contributions to Jupyter. But, it is important to note that these +contributions are typically only changes to the repositories. Thus, the Jupyter +source code, in its entirety is not the copyright of any single person or +institution. Instead, it is the collective copyright of the entire Jupyter +Development Team. If individual contributors want to maintain a record of what +changes/contributions they have specific copyright on, they should indicate +their copyright in the commit message of the change, when they commit the +change to one of the Jupyter repositories. + +With this in mind, the following banner should be used in any source code file +to indicate the copyright and license terms: + + # Copyright (c) Jupyter Development Team. + # Distributed under the terms of the Modified BSD License. diff --git a/all-spark-notebook/Dockerfile b/all-spark-notebook/Dockerfile index 507b1a2f4f..8ce0bbe094 100644 --- a/all-spark-notebook/Dockerfile +++ b/all-spark-notebook/Dockerfile @@ -1,4 +1,5 @@ # Copyright (c) Jupyter Development Team. +# Distributed under the terms of the Modified BSD License. FROM jupyter/minimal-notebook MAINTAINER Jupyter Project diff --git a/datascience-notebook/Dockerfile b/datascience-notebook/Dockerfile index 7a7fed243d..59b02c27c6 100644 --- a/datascience-notebook/Dockerfile +++ b/datascience-notebook/Dockerfile @@ -1,3 +1,5 @@ +# Copyright (c) Jupyter Development Team. +# Distributed under the terms of the Modified BSD License. FROM jupyter/minimal-notebook MAINTAINER Jupyter Project diff --git a/minimal-kernel/Dockerfile b/minimal-kernel/Dockerfile index 18173fae52..bd0de2cdb6 100644 --- a/minimal-kernel/Dockerfile +++ b/minimal-kernel/Dockerfile @@ -1,4 +1,5 @@ # Copyright (c) Jupyter Development Team. +# Distributed under the terms of the Modified BSD License. FROM debian:jessie MAINTAINER Jupyter Project diff --git a/minimal-notebook/Dockerfile b/minimal-notebook/Dockerfile index 7f4a6e1ee4..815e559d23 100644 --- a/minimal-notebook/Dockerfile +++ b/minimal-notebook/Dockerfile @@ -1,4 +1,5 @@ # Copyright (c) Jupyter Development Team. +# Distributed under the terms of the Modified BSD License. FROM debian:jessie MAINTAINER Jupyter Project diff --git a/pyspark-notebook/Dockerfile b/pyspark-notebook/Dockerfile index 45bb67ea36..255697384d 100644 --- a/pyspark-notebook/Dockerfile +++ b/pyspark-notebook/Dockerfile @@ -1,4 +1,5 @@ # Copyright (c) Jupyter Development Team. +# Distributed under the terms of the Modified BSD License. FROM jupyter/minimal-notebook MAINTAINER Jupyter Project diff --git a/r-notebook/Dockerfile b/r-notebook/Dockerfile index 54589b931d..3ded397025 100644 --- a/r-notebook/Dockerfile +++ b/r-notebook/Dockerfile @@ -1,4 +1,5 @@ # Copyright (c) Jupyter Development Team. +# Distributed under the terms of the Modified BSD License. FROM jupyter/minimal-notebook MAINTAINER Jupyter Project diff --git a/scipy-notebook/Dockerfile b/scipy-notebook/Dockerfile index 7d2a70f045..d35ca96e22 100644 --- a/scipy-notebook/Dockerfile +++ b/scipy-notebook/Dockerfile @@ -1,4 +1,5 @@ # Copyright (c) Jupyter Development Team. +# Distributed under the terms of the Modified BSD License. FROM jupyter/minimal-notebook MAINTAINER Jupyter Project