Update policies and add Homeserver Pricing page #2805
Conversation
Signed-off-by: Thib <[email protected]>
Signed-off-by: Thib <[email protected]>
Signed-off-by: Thib <[email protected]>
Signed-off-by: Thib <[email protected]>
Deploying matrix-website with
|
| Latest commit: |
3df66e6
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://98bd1a97.matrix-website.pages.dev |
| Branch Preview URL: | https://update-policies.matrix-website.pages.dev |
HarHarLinks
added
the
legal
|
How does this relate to #2775? |
There was a problem hiding this comment.
This is missing some of the same technical fixes I already mentioned at #2775, and some non-technical changes e.g. for apparent typos.
| +++ | ||
| title = "Matrix.org Foundation Privacy Policy" | ||
| version = "3.1.0" | ||
| version = "3.2.0" |
There was a problem hiding this comment.
we should probably adjust the template for these versioned pages (probably https://github.com/matrix-org/matrix.org/blob/main/templates/legal.html) so they actually show the version to the reader.
There was a problem hiding this comment.
- I suggest to rename this file (and update links, plus establish a forwarding rule) if it's no longer "and conditions", but "homeserver terms"
- we should decide and document if we keep legal docs in one place and link to them from another (e.g. from the homeserver section) or vice versa.
There was a problem hiding this comment.
Legal tells me to keep things as is for now
hughns
changed the title
Signed-off-by: Thib <[email protected]>
Signed-off-by: Thib <[email protected]>
Signed-off-by: Thib <[email protected]>
Co-authored-by: Hugh Nimmo-Smith <[email protected]>
|
|
||
| When you read the ‘**Service**', or the ‘**Website**’ below, it refers to the services made available at Matrix.org which store your account and personal conversation history, using or interacting with the website, purchasing Usage Plans and using our shop or donations section. | ||
|
|
||
| If you purchase access and use of the public Matrix.org homeserver, our Homeserver Terms will also apply to you. |
There was a problem hiding this comment.
link the homeserver terms
| ### 1.1 Definition of terms | ||
|
|
||
| Contact Information: | ||
| Where you read The Matrix.org Foundation C.I.C., The Matrix.org Foundation, The Matrix Foundation, or the Foundation, it refers to the Community Interest Company incorporated on 29 October 2018 to be the neutral custodian of the Matrix protocol: The Matrix.org Foundation C.I.C., and their agents. |
There was a problem hiding this comment.
I would suggest setting apart the homeserver which is often referred to by its technical domain matrix.org and The Matrix.org Foundation C.I.C. (note capitalisation) by continuing the established conventions of "matrix.org" for the homeserver and Matrix.org for the Foundation. This should be referenced or included in all of the policy documents.
There was a problem hiding this comment.
That was partially also done in this PR by b6b0dc1, however not on all files.
There was a problem hiding this comment.
Since this is blocking for the Matrix Premium project, let's not block on this and fix it separately
Co-authored-by: Kim Brose <[email protected]>
There was a problem hiding this comment.
There are plenty of remarks from #2775 that still apply here. It feels to me like it would be a waste of time continuing this review before all of these have been addressed.
| version = "3.2.0" | ||
| +++ | ||
|
|
||
| Effective date of 21 July 2025 |
There was a problem hiding this comment.
After we merge this by 4 July, how do I as a reader find the currently effective terms before 21 July?
| * the user agent we saw when it got created | ||
| * which client you used |
Co-authored-by: Kim Brose <[email protected]>
Co-authored-by: Kim Brose <[email protected]>
Signed-off-by: Thib <[email protected]>
Signed-off-by: Thib <[email protected]>
Co-authored-by: Kim Brose <[email protected]>
|
There is a 2 weeks uncompressible delay between publishing this update and the new terms being effective, which is on the critical path of launching paid accounts. Whilst all the feedback is valuable and a lot of it is a no brainer to integrate, I can't see anything being a blocker, so I would recommend to push the current version asap to stop delaying the launch, and incorporate the comments (and those on #2775) in the next update which will also link to the trademark policy. |
Supersedes #2775
This PR is blocking the Matrix.org Premium Accounts rollout. We should review and merge it as soon as realistically possible. We must publish it before Friday 4 July.