Move license information from COPYING.md

lresende · lresende · commit 13039db1a6f1 · 2019-11-04T15:09:34.000-08:00
Closes #4765 Fixes 2768
diff --git a/LICENSE b/LICENSE
@@ -1,5 +1,3 @@
-# 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:
 
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,4 +1,4 @@
-include COPYING.md
+include LICENSE
 include CONTRIBUTING.rst
 include README.md
 include package.json
diff --git a/notebook/log.py b/notebook/log.py
@@ -2,7 +2,7 @@
 #  Copyright (c) Jupyter Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
-#  the file COPYING, distributed as part of this software.
+#  the file LICENSE, distributed as part of this software.
 #-----------------------------------------------------------------------------
 
 import json
diff --git a/setup.cfg b/setup.cfg
@@ -2,7 +2,7 @@
 universal=0
 
 [metadata]
-license_file = COPYING.md
+license_file = LICENSE
 
 [nosetests]
 warningfilters=module   |.*            |DeprecationWarning |notebook.*
diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 #
 #  Distributed under the terms of the Modified BSD License.
 #
-#  The full license is in the file COPYING.md, distributed with this software.
+#  The full license is in the file LICENSE, distributed with this software.
 #-----------------------------------------------------------------------------
 
 import os

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# Licensing terms`
`2`		`-`
`3`	`1`	`This project is licensed under the terms of the Modified BSD License`
`4`	`2`	`(also known as New or Revised or 3-Clause BSD), as follows:`
`5`	`3`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`# Copyright (c) Jupyter Development Team`
`3`	`3`	`#`
`4`	`4`	`# Distributed under the terms of the BSD License. The full license is in`
`5`		`-# the file COPYING, distributed as part of this software.`
	`5`	`+# the file LICENSE, distributed as part of this software.`
`6`	`6`	`#-----------------------------------------------------------------------------`
`7`	`7`
`8`	`8`	`import json`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`#`
`9`	`9`	`# Distributed under the terms of the Modified BSD License.`
`10`	`10`	`#`
`11`		`-# The full license is in the file COPYING.md, distributed with this software.`
	`11`	`+# The full license is in the file LICENSE, distributed with this software.`
`12`	`12`	`#-----------------------------------------------------------------------------`
`13`	`13`
`14`	`14`	`import os`