diff options
| -rw-r--r-- | LICENSE.txt | 34 | ||||
| -rw-r--r-- | doc/developer/API.md | 2 | ||||
| -rw-r--r-- | doc/install/Configuration-Settings.md | 10 | ||||
| -rw-r--r-- | doc/process/overview.md | 2 |
4 files changed, 18 insertions, 30 deletions
diff --git a/LICENSE.txt b/LICENSE.txt index c0c337525..88200cdba 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -2,34 +2,22 @@ Mattermost Licensing SOFTWARE LICENSING -Mattermost server is made available under two separate licensing options: +You are licensed to use compiled versions of the Mattermost platform produced by Mattermost, Inc. under an MIT LICENSE -- Free Software Foundation’s GNU AGPL v.3.0, subject to the exceptions outlined in this policy; or -- Commercial licenses available from Mattermost, Inc. by contacting commercial@mattermost.com +- See MIT-COMPILED-LICENSE.md included in compiled versions for details. -Admin Tools and Configuration Files (api/templates/, config/, model/, web/react/utils/, web/static/, web/templates/ and all -subdirectories thereof) are made available under: +You may be licensed to use source code to create compiled versions not produced by Mattermost, Inc. in one of two ways: -- Apache License v2.0 +1. Under the Free Software Foundation’s GNU AGPL v.3.0, subject to the exceptions outlined in this policy; or +2. Under a commercial license available from Mattermost, Inc. by contacting commercial@mattermost.com -LICENSING POLICY +You are licensed to use the source code in Admin Tools and Configuration Files (api/templates/, config/, model/, +web/react/utils/, web/static/, web/templates/ and all subdirectories thereof) under the Apache License v2.0. -The objective of the Mattermost server license is to require enhancements to Mattermost server be shared with the community -while allowing for non-enhanced use in proprietary applications. - -Therefore, the Mattermost server is free to use, modify and redistribute in open source applications via the -copyleft AGPL license. For proprietary applications (systems that don’t share source back to the community), -Mattermost is free to use and redistribute so long as you’re not withholding proprietary enhancements to the -Mattermost server and you’re only linking directly to or changing Admin Tools and Configuration Files (defined above), which -are released under an Apache 2.0 license, and copyleft free. - -We promise that we will not enforce the copyleft provisions in AGPL v3.0 against you if your application (a) does -not link to the Mattermost server directly, but exclusively uses the Mattermost Admin Tools and Configuration Files, -and (b) you have not modified, added to or adapted the source code of Mattermost in a way that results in the creation -of a “modified version” or “work based on” Mattermost as these terms are defined in the AGPL v3.0 license. - -If the above is not enough to satisfy your organization’s legal department (some will not approve GPL in any form), -commercial licenses are available from commercial@mattermost.com. +We promise that we will not enforce the copyleft provisions in AGPL v3.0 against you if your application (a) does not +link to the Mattermost Platform directly, but exclusively uses the Mattermost Admin Tools and Configuration Files, and +(b) you have not modified, added to or adapted the source code of Mattermost in a way that results in the creation of +a “modified version” or “work based on” Mattermost as these terms are defined in the AGPL v3.0 license. MATTERMOST TRADEMARK GUIDELINES diff --git a/doc/developer/API.md b/doc/developer/API.md index 1be3669ab..1da1a475b 100644 --- a/doc/developer/API.md +++ b/doc/developer/API.md @@ -40,7 +40,7 @@ If you're building a deep integration with Mattermost, for example a mobile nati If no driver is available for the programming language of your choice, you can view the [Golang Driver](https://github.com/mattermost/platform/blob/master/model/client.go) source code to understand how it exercises the Web Service API. You can also learn more by reviewing open source projects that use the Web Service API, like [matterircd](https://github.com/42wim/matterircd). -There are a wide range of [installation guides](www.mattermost.org/installation/) for setting up your own Mattermost server on which to develop and test your integrations. +There are a wide range of [installation guides](http://www.mattermost.org/installation/) for setting up your own Mattermost server on which to develop and test your integrations. diff --git a/doc/install/Configuration-Settings.md b/doc/install/Configuration-Settings.md index 44730d40f..66fda15e0 100644 --- a/doc/install/Configuration-Settings.md +++ b/doc/install/Configuration-Settings.md @@ -268,19 +268,19 @@ Settings to configure account and team creation using GitLab OAuth. “true”: Allow team creation and account signup using GitLab OAuth. To configure, input the **Secret** and **Id** credentials. ```"Secret": ""``` -Obtain this value by logging into your GitLab account. Go to Profile Settings -> Applications -> New Application, enter a Name, then enter Redirect URLs "https://<your-mattermost-url>/login/gitlab/complete" (example: https://example.com:8065/login/gitlab/complete) and "https://<your-mattermost-url>/signup/gitlab/complete". +Obtain this value by logging into your GitLab account. Go to Profile Settings -> Applications -> New Application, enter a Name, then enter Redirect URLs `https://<your-mattermost-url>/login/gitlab/complete` (example: `https://example.com:8065/login/gitlab/complete`) and `https://<your-mattermost-url>/signup/gitlab/complete`. ```"Id": ""``` -Obtain this value by logging into your GitLab account. Go to Profile Settings -> Applications -> New Application, enter a Name, then enter Redirect URLs "https://<your-mattermost-url>/login/gitlab/complete" (example: https://example.com:8065/login/gitlab/complete) and "https://<your-mattermost-url>/signup/gitlab/complete". +Obtain this value by logging into your GitLab account. Go to Profile Settings -> Applications -> New Application, enter a Name, then enter Redirect URLs `https://<your-mattermost-url>/login/gitlab/complete` (example: `https://example.com:8065/login/gitlab/complete`) and `https://<your-mattermost-url>/signup/gitlab/complete`. ```"AuthEndpoint": ""``` -Enter https://<your-gitlab-url>/oauth/authorize (example: https://example.com:3000/oauth/authorize). Use HTTP or HTTPS depending on how your server is configured. +Enter `https://<your-gitlab-url>/oauth/authorize` (example: `https://example.com:3000/oauth/authorize`). Use HTTP or HTTPS depending on how your server is configured. ```"TokenEndpoint": ""``` -Enter https://<your-gitlab-url>/oauth/authorize (example: https://example.com:3000/oauth/token). Use HTTP or HTTPS depending on how your server is configured. +Enter `https://<your-gitlab-url>/oauth/authorize` (example: `https://example.com:3000/oauth/token`). Use HTTP or HTTPS depending on how your server is configured. ```"UserApiEndpoint": ""``` -Enter https://<your-gitlab-url>/oauth/authorize (example: https://example.com:3000/api/v3/user). Use HTTP or HTTPS depending on how your server is configured. +Enter `https://<your-gitlab-url>/oauth/authorize` (example: `https://example.com:3000/api/v3/user`). Use HTTP or HTTPS depending on how your server is configured. ## Config.json Settings Not in System Console diff --git a/doc/process/overview.md b/doc/process/overview.md index b34908782..a1201a8d6 100644 --- a/doc/process/overview.md +++ b/doc/process/overview.md @@ -40,7 +40,7 @@ A system primarily used by Mattermost for reporting bugs with clear statements o See [Filing Issues](http://www.mattermost.org/filing-issues/) for details on how to file issues for Mattermost in GitHub. -For feature ideas, troubleshooting, or general questions, we ask your help to use the appropriate [Community System](https://github.com/mattermost/platform/blob/master/doc/process/overview.md#community-systems). +Please consider using more mainstream processes for [filing feature ideas to be upvoted](https://github.com/mattermost/platform/blob/master/doc/process/overview.md#feature-idea-forum), to ask [troubleshooting questions](https://github.com/mattermost/platform/blob/master/doc/process/overview.md#troubleshooting-forum), or [general questions](https://github.com/mattermost/platform/blob/master/doc/process/overview.md#general-forum). ### GitHub Pull Requests |