From d4d007b5f38d2637bf85ab7f3b80dc7c13d7ffb8 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Mon, 10 Jul 2023 11:49:19 +0200 Subject: [PATCH 1/4] Clarify the license of ownCloud Infinite Scale binary packages. --- docs/ocis/license.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/ocis/license.md b/docs/ocis/license.md index ee6b3be08d5..5ec4d14a475 100644 --- a/docs/ocis/license.md +++ b/docs/ocis/license.md @@ -7,4 +7,8 @@ geekdocEditPath: edit/master/docs/ocis geekdocFilePath: license.md --- -This project is licensed under the [Apache 2.0](https://github.com/owncloud/ocis/blob/master/LICENSE) license. For the license of the used libraries you have to check the respective sources. +The source code of the project is licensed under the [Apache 2.0](https://github.com/owncloud/ocis/blob/master/LICENSE) license. For the license of the used libraries you have to check the respective sources. + +Stable, supported binary builds of ownCloud Infinte Scale that will be distributed by ownCloud GmbH are covered by a non OSS Freemium License [EULA](https://owncloud.com/license-owncloud-infinite-scale/). This protects additional efforts that ownCloud GmbH is putting into these builds. + +Since the source code of Infinite Scale is available under free licenses, the free usage can, should and will not be limited in general. From 235c1fd55ee97e52f9cffa4992687477dea31e7a Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Mon, 10 Jul 2023 11:53:31 +0200 Subject: [PATCH 2/4] Add changelog --- changelog/unreleased/clarify_license.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelog/unreleased/clarify_license.md diff --git a/changelog/unreleased/clarify_license.md b/changelog/unreleased/clarify_license.md new file mode 100644 index 00000000000..08b0c30bc85 --- /dev/null +++ b/changelog/unreleased/clarify_license.md @@ -0,0 +1,5 @@ +Enhancement: Clarify license text in the dev docs + +Explain the usage of the EULA for binary builds. + +https://github.com/owncloud/ocis/pull/6755 From fe35aee21e3fb0a7e130858ab733d1517ab89924 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Mon, 10 Jul 2023 12:01:09 +0200 Subject: [PATCH 3/4] Fix link and wording in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b984204e752..e5303d57711 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,7 @@ Please always refer to our [Contribution Guidelines](https://github.com/owncloud ## End User License Agreement -Stable versions of ownCloud Infinite Scale are subject to the [End User License Agreement](https://github.com/owncloud/ocis/blob/master/assets/End-User-License-Agreement-for-ownCloud-Infinite-Scale.pdf). +Some builds of stable ownCloud Infinite Scale releases provided by ownCloud GmbH are subject to an [End User License Agreement](https://owncloud.com/license-owncloud-infinite-scale/). ## Copyright From bfa980ef59552fe72ceca6de824ef65d4893f38e Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Mon, 10 Jul 2023 12:11:17 +0200 Subject: [PATCH 4/4] Fix typo in Infinite Co-authored-by: Phil Davis --- docs/ocis/license.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/ocis/license.md b/docs/ocis/license.md index 5ec4d14a475..bd98bc99472 100644 --- a/docs/ocis/license.md +++ b/docs/ocis/license.md @@ -9,6 +9,6 @@ geekdocFilePath: license.md The source code of the project is licensed under the [Apache 2.0](https://github.com/owncloud/ocis/blob/master/LICENSE) license. For the license of the used libraries you have to check the respective sources. -Stable, supported binary builds of ownCloud Infinte Scale that will be distributed by ownCloud GmbH are covered by a non OSS Freemium License [EULA](https://owncloud.com/license-owncloud-infinite-scale/). This protects additional efforts that ownCloud GmbH is putting into these builds. +Stable, supported binary builds of ownCloud Infinite Scale that will be distributed by ownCloud GmbH are covered by a non OSS Freemium License [EULA](https://owncloud.com/license-owncloud-infinite-scale/). This protects additional efforts that ownCloud GmbH is putting into these builds. Since the source code of Infinite Scale is available under free licenses, the free usage can, should and will not be limited in general.