Update policies and add Homeserver Pricing page (#2805)

* Update homeserver terms

Signed-off-by: Thib <[email protected]>

* Update homeserver terms

Signed-off-by: Thib <[email protected]>

* Add website terms

Signed-off-by: Thib <[email protected]>

* Update privacy policy

Signed-off-by: Thib <[email protected]>

* Fix references to homeserver T&Cs

* Add pricing page

* Use lowercase m on homeserver name consistently

* Remove duplicated front matter

* Add effective date

Signed-off-by: Thib <[email protected]>

* Add css to make tables more readable without messing up the blog posts

Signed-off-by: Thib <[email protected]>

* Carry over changes from #2775

Signed-off-by: Thib <[email protected]>

* Swap Matrix for matrix.org

Co-authored-by: Hugh Nimmo-Smith <[email protected]>

* Fix typo in room address

Co-authored-by: Kim Brose <[email protected]>

* Update content/contact.md

Co-authored-by: Kim Brose <[email protected]>

* Update content/legal/privacy-notice.md

Co-authored-by: Kim Brose <[email protected]>

* Fix broken link and mention password hash instead of plain password

Signed-off-by: Thib <[email protected]>

* Add line breaks for the address

Signed-off-by: Thib <[email protected]>

* Update content/homeserver/pricing.md

Co-authored-by: Kim Brose <[email protected]>

---------

Signed-off-by: Thib <[email protected]>
Co-authored-by: Hugh Nimmo-Smith <[email protected]>
Co-authored-by: Hugh Nimmo-Smith <[email protected]>
Co-authored-by: Kim Brose <[email protected]>

Author: 3 people

content/contact.md

@@ -9,9 +9,10 @@ For direct inquiries about the following topics, please email us:
 
 - [[email protected]](mailto:[email protected]) if you need to urgently report
   abuse on the platform. See also our [Code of Conduct](/legal/code-of-conduct/) and the
-  Matrix.org Homeserver Terms and Conditions (specifically [[1]](/legal/terms-and-conditions/#6-2-illegal-content)
-  and [[2]](https://matrix.org/legal/terms-and-conditions/#1-4-breach-of-terms)).
+  Matrix.org Homeserver Terms (specifically [[1]](/legal/terms-and-conditions/#7-3-illegal-and-regulated-content)
+  and [[2]](/legal/terms-and-conditions/#1-3-breach-of-terms)).
 - [[email protected]](mailto:[email protected]) for more general support and
+- [[email protected]](mailto:[email protected]) for support with your matrix.org homeserver [premium account](/homeserver/pricing).
   commercial queries.
 - [[email protected]](mailto:[email protected]) to disclose security issues.
   Also see our [Security Disclosure Policy](/security-disclosure-policy/).

content/homeserver/pricing.md

@@ -0,0 +1,49 @@
++++
+title = "Matrix.org Homeserver Pricing"
++++
+
+One of the missions of the Matrix.org Foundation is to nurture and grow the ecosystem and the network. To support this mission, the Foundation provides the public matrix.org homeserver as an easy entry point for those wanting to create their first Matrix account and join the network. The matrix.org homeserver has played a key role in the growth of the ecosystem since the project started in 2014.
+
+To help pay for the costs associated with providing a public homeserver, the Foundation is introducing premium accounts as announced in the blog post [here](/blog/2025/06/funding-homeserver-premium).
+
+These new usage plans are being introduced in a phased manner and so not all new users will be placed on a plan automatically.
+
+Where a user is not currently on a plan they may be changed to a free plan in the future, and will be notified in advance.
+
+## Your Data, Your Choice
+
+Matrix is a decentralised network by design, and the goal is to give the users the ability to choose where they would like to create their accounts, as it then gives them control over where their data is stored and who is looking after them.
+
+This means that you don’t have to be using the matrix.org homeserver. You could choose to use another shared homeserver or you could have your own dedicated homeserver.
+
+For those that want to have their own homeserver the Foundation maintains a list of [known hosting providers](/ecosystem/hosting/) that might be suitable for your needs.
+
+## Pricing
+
+Details of pricing have not yet been finalised, but will be published here once usage plans will be made available.
+
+Pricing may change over time, as described in the [Homeserver Terms](/legal/terms-and-conditions#6-payment).
+
+## Usage limits
+
+Where a user account has been allocated to a plan the following usage limits apply:
+
+|Usage|Free plan|Premium plan|
+|-|-|-|
+|Size of attachment that can be sent|1MB maximum|100MB maximum|
+|Speed at which you can invite others to a room|Standard|10 times faster|
+|Ability to create public rooms|Not available|Available|
+
+Usage limits may change over time as we refine the offering.
+
+## FAQs
+
+For now, please refer to the [blog post](/blog/2025/06/funding-homeserver-premium) to answer your questions.
+
+## Support
+
+If you are on the premium plan then you can get support via email at [[email protected]](mailto:[email protected]).
+
+## Legals
+
+Usage of the public matrix.org homeserver and usage plans is subject to the [Matrix.org Foundation Privacy Policy](/legal/privacy-notice) and [Matrix.org Homeserver Terms](/legal/terms-and-conditions).

content/legal/law-enforcement-guidelines.md

@@ -64,7 +64,7 @@ Send your preservation requests to [[email protected]](mailto:[email protected]).
 
 ### Reporting Terms of Service Violations
 
-If you believe that a user or room is violating our [Terms and Conditions](https://matrix.org/legal/terms-and-conditions), please report this information via [[email protected]](mailto:[email protected]) providing as much information as possible, and we will take action as appropriate. 
+If you believe that a user or room is violating our [Terms](https://matrix.org/legal/terms-and-conditions), please report this information via [[email protected]](mailto:[email protected]) providing as much information as possible, and we will take action as appropriate. 
 
 We do not remove content based on disagreements, allegations or breaches of rules related to specific communities. Removal of content will only occur when it breaches our [Terms](https://matrix.org/legal/terms-and-conditions). We may refer information about accounts sharing illegal content to the relevant authorities.