summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--LICENSE.md12
-rw-r--r--Makefile.am3
-rw-r--r--README.md2
-rw-r--r--REDISTRIBUTED.md (renamed from LICENSE-REDISTRIBUTED.md)6
4 files changed, 7 insertions, 16 deletions
diff --git a/LICENSE.md b/LICENSE.md
deleted file mode 100644
index 55b4d3c5cf..0000000000
--- a/LICENSE.md
+++ /dev/null
@@ -1,12 +0,0 @@
-**netdata**<br/>
-(C) Copyright 2017-2018<br/>
-Costa Tsaousis &lt;costa@tsaousis.gr&gt;
-
-For license details refer to the following files:
-
-- [netdata license](LICENSES/GPL-3.0) (GPL v3+)
-- [third party licenses](LICENSE-REDISTRIBUTED.md), for packages re-distributed with netdata
-
-Netdata uses SPDX license tags to identify the license for it's files.
-Individual licenses referenced in the tags can be found in [the LICENSES
-directory](LICENSES/).
diff --git a/Makefile.am b/Makefile.am
index 2d8ccae83c..91b7ab3d03 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,8 +54,7 @@ EXTRA_DIST = \
LICENSES/OFL-1.1 \
LICENSES/Python-2.0 \
LICENSES/WTFPL \
- LICENSE.md \
- LICENSE-REDISTRIBUTED.md \
+ REDISTRIBUTED.md \
autogen.sh \
$(NULL)
diff --git a/README.md b/README.md
index 7c25996cdc..0f95eee191 100644
--- a/README.md
+++ b/README.md
@@ -367,4 +367,4 @@ Check the **[netdata wiki](https://github.com/firehol/netdata/wiki)**.
netdata is [GPLv3+](LICENSE).
-It re-distributes other open-source tools and libraries. Please check the [third party licenses](https://github.com/firehol/netdata/blob/master/LICENSE-REDISTRIBUTED.md).
+Netdata re-distributes other open-source tools and libraries. Please check the [third party licenses](https://github.com/firehol/netdata/blob/master/REDISTRIBUTED.md).
diff --git a/LICENSE-REDISTRIBUTED.md b/REDISTRIBUTED.md
index b22bdd97df..d8d85a9228 100644
--- a/LICENSE-REDISTRIBUTED.md
+++ b/REDISTRIBUTED.md
@@ -1,8 +1,13 @@
# Netdata
Copyright 2016-2017, Costa Tsaousis.
+Copyright 2017, Netdata Inc.
Released under [GPL v3 or later](http://www.gnu.org/licenses/gpl-3.0.en.html).
+Netdata uses SPDX license tags to identify the license for it's files.
+Individual licenses referenced in the tags can be found in [the LICENSES
+directory](LICENSES/).
+
---
## Re-distributed software
@@ -12,7 +17,6 @@ We have decided to re-distribute all these, instead of using them
through a CDN, to allow netdata to work in cases where internet
connectivity is not available.
-
- [Dygraphs](http://dygraphs.com/)
Copyright 2009, Dan Vanderkam