Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[docs-only] Clarify the license of ownCloud Infinite Scale binary packages. #6755

Merged
merged 4 commits into from
Jul 10, 2023
Merged

[docs-only] Clarify the license of ownCloud Infinite Scale binary packages. #6755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d4d007b
Clarify the license of ownCloud Infinite Scale binary packages.
dragotin Jul 10, 2023
235c1fd
Add changelog
dragotin Jul 10, 2023
fe35aee
Fix link and wording in README.md
dragotin Jul 10, 2023
bfa980e
Fix typo in Infinite
dragotin Jul 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 5 additions & 0 deletions changelog/unreleased/clarify_license.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 5 additions & 1 deletion docs/ocis/license.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 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.