Skip to content

Commit 29f5642

Browse files
Carry over changes from #2775
Signed-off-by: Thib <[email protected]>
1 parent 0fb3f85 commit 29f5642

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

content/legal/privacy-notice.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ Where you read Matrix.org, Matrix.org Foundation C.I.C., The Matrix.org Foundat
2222

2323
The Matrix protocol is licensed by the Matrix.org Foundation which makes it available to third parties who set up their own homeserver. This privacy policy does not apply to such Matrix servers run by anyone else - Matrix is an open network like the Web and this agreement only applies to the server (Matrix.org) provided by Element.
2424

25-
Matrix.org is the Data Controller for the Service and works with [Element](element.io) as a Processor for data processing, hosting and management purposes. We can be contacted as per the details below:
25+
Matrix.org is the Data Controller for the Service and works with [Element](https://element.io) as a Processor for data processing, hosting and management purposes. We can be contacted as per the details below:
2626

27-
27+
2828

2929
Postal address:
3030

@@ -34,7 +34,7 @@ London
3434
United Kingdom
3535
EC4R 1AG
3636

37-
Should you have other questions or concerns about this document, please send us an email at [[email protected]](mailto:[email protected]).
37+
Should you have other questions or concerns about this document, please send us an email at <[email protected]>.
3838

3939
### 1.2 This is a living document
4040

@@ -73,7 +73,7 @@ You have rights in relation to the personal data we hold about you. Some of thes
7373
1. The right to object
7474
1. Rights in relation to automated decision making and profiling.
7575

76-
We may ask for proof of identity before responding to your request. For more details about these rights, please see the guidance provided by the ICO. If you have any questions or are unsure how to exercise your rights, please contact us at [[email protected]](mailto:[email protected]).
76+
We may ask for proof of identity before responding to your request. For more details about these rights, please see the guidance provided by the ICO. If you have any questions or are unsure how to exercise your rights, please contact us at <[email protected]>.
7777

7878
#### 2.1.3 Right to erasure
7979

@@ -123,7 +123,7 @@ We collect information about you when you register for an account. This informat
123123
* Your email address (if you choose to provide it)
124124
* Your verified telephone number (if you choose to provide it)
125125
* Your username and password is used to authenticate your access to the Service and to uniquely identify you within the Service.
126-
* Your password hashes stored until your account is deactivated (see 2.6 for details on how passwords are handled securely). Your username is stored indefinitely to avoid account recycling.
126+
* Your password hash is stored until your account is deactivated (see 2.6 for details on how passwords are handled securely). Your username is stored indefinitely to avoid account recycling.
127127
* When you've registered your account and what SSO links you might have (i.e. 'Facebook ID', 'Google ID', etc.)
128128
* Type of account (i.e. free or paid)
129129

@@ -306,7 +306,7 @@ If you become aware of any unauthorised use of your account or any other breach
306306

307307
If you forget your password (and you have registered an email address) you can use the password reset facility to reset it.
308308

309-
You can manage your account by using a Matrix client such as Element, FluffyChat, Hydrogen and many others. Click [here](matrix.org/ecosystem/clients) for a comprehensive list of Matrix clients.
309+
You can manage your account by using a Matrix client such as Element, FluffyChat, Hydrogen and many others. Click [here](https://matrix.org/ecosystem/clients) for a comprehensive list of Matrix clients.
310310

311311
It is our policy to not change passwords on your behalf. This is ultimately to protect your privacy and the integrity of your account.
312312

@@ -329,7 +329,7 @@ Rooms have different visibility settings which are determined by the room admini
329329
* `shared`: people need to join the room to see the history, but will then see the history up to when this visibility setting was set (the change is not retroactive).
330330
* `world_readable`: everyone can see the room history without even joining the room.
331331

332-
If you share information in a room set to world_readable this might be available to people outside the Matrix ecosystem and indexed by search engines, via projects such as [archive.matrix.org](archive.matrix.org). Please ensure that you double check the settings of each room before you participate and always avoid sharing personal and sensitive data in unencrypted rooms.
332+
If you share information in a room set to world_readable this might be available to people outside the Matrix ecosystem and indexed by search engines, via projects such as [archive.matrix.org](https://archive.matrix.org). Please ensure that you double check the settings of each room before you participate and always avoid sharing personal and sensitive data in unencrypted rooms.
333333

334334
In encrypted rooms, the data is stored in our databases but the encryption keys are stored only on your devices or by yourself. Users can optionally backup an encrypted copy of their keys on the Service to aid recovery if they lose all their keys and devices. This key backup is encrypted by a recovery key that only the user has access to. Element (the company, employees, and contractors) are unable to read your message content in our database. If you lose access to your encryption keys, you lose access to your messages forever.
335335

@@ -377,7 +377,7 @@ Please act in good faith towards our users' privacy and data during your disclos
377377

378378
## Making a Complaint
379379

380-
We try to meet the highest standards when collecting and using personal information. For this reason, we take any complaints we receive about this very seriously. We encourage people to bring it to our attention at [[email protected]](mailto:[email protected]) if they think that our collection or use of information is unfair, misleading or inappropriate. We would also welcome any suggestions for improving our procedures.
380+
We try to meet the highest standards when collecting and using personal information. For this reason, we take any complaints we receive about this very seriously. We encourage people to bring it to our attention at <[email protected]> if they think that our collection or use of information is unfair, misleading or inappropriate. We would also welcome any suggestions for improving our procedures.
381381

382382
If you want to make a complaint about the way we have processed your personal information to the supervisory authority, you can contact the ICO (the statutory body which oversees data protection law) at <https://www.ico.org.uk/concerns>.
383383

0 commit comments

Comments
 (0)