Skip to content

Commit ca2e32a

Browse files
thibaultamartinthibaultamartin
authored
Zola footer pages (#1537)
* Add security disclosure policy * Add hall-of-fame * Make spellcheck happy * Make findings stand out more in the hall of fame * Don't say the same think twice * Add legal section * Add contact page * Call the security hall of fame consistently * Fix legal markdown * I said consistently * Address last concerns
1 parent a657744 commit ca2e32a

14 files changed

+1804
-1
lines changed

‎content/contact.md

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
+++
2+
title = "Contact"
3+
+++
4+
5+
The best place to get information and connect is on Matrix itself - starting in
6+
[Matrix HQ (#matrix:matrix.org)](https://matrix.to/#/#matrix:matrix.org).
7+
8+
However, if you prefer email, or have a need to be more direct:
9+
10+
- [[email protected]]("mailto:[email protected]") if you need to urgently report
11+
abuse on the platform
12+
- [[email protected]](mailto:[email protected]) for more general support and
13+
commercial queries
14+
- [[email protected]](mailto:[email protected]) to disclose security issues.
15+
Also see our [Security Disclosure Policy](/security-disclosure-policy/)

‎content/legal/_index.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
+++
2+
title = "Legal"
3+
template = "legal.html"
4+
+++
5+

‎content/legal/code-of-conduct.md

+69
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
+++
2+
title = "Matrix Code of Conduct"
3+
+++
4+
5+
This code of conduct outlines our expectations for participants within the Matrix community, as well as steps for reporting unacceptable behaviour. We are committed to providing a welcoming and inspiring community for all, and expect our code of conduct to be honoured. Anyone who violates this code of conduct may be banned from the community.
6+
7+
This applies to conversation in the any room in the matrix community ([+matrix:matrix.org](https://matrix.to/#/+matrix:matrix.org)) and commits and comments relating to any project in the [matrix-org](https://github.com/matrix-org) github space.
8+
9+
Our open source community strives to:
10+
11+
* **Be friendly and patient.**
12+
* **Be welcoming**: We strive to be a community that welcomes and supports people of all backgrounds and identities. This includes, but is not limited to members of any race, ethnicity, culture, national origin, colour, immigration status, social and economic class, educational level, sex, sexual orientation, gender identity and expression, age, size, family status, political belief, religion, and mental and physical ability.
13+
* **Be considerate**: Your work will be used by other people, and you in turn will depend on the work of others. Any decision you take will affect users and colleagues, and you should take those consequences into account when making decisions. Remember that we're a world-wide community, so you might not be communicating in someone else's primary language.
14+
* **Be respectful**: Not all of us will agree all the time, but disagreement is no excuse for poor behaviour and poor manners. We might all experience some frustration now and then, but we cannot allow that frustration to turn into a personal attack. It’s important to remember that a community where people feel uncomfortable or threatened is not a productive one.
15+
* **Be careful in the words that we choose**: Be kind to others. Do not insult or put down other participants. Harassment and other exclusionary behaviour aren't acceptable.
16+
* **Try to understand why we disagree**: Disagreements, both social and technical, happen all the time. It is important that we resolve disagreements and differing views constructively. Remember that we’re different. The strength of our community comes from its diversity, people from a wide range of backgrounds. Different people have different perspectives on issues. Being unable to understand why someone holds a viewpoint doesn’t mean that they’re wrong. Don’t forget that it is human to err and blaming each other doesn’t get us anywhere. Instead, focus on helping to resolve issues and learning from mistakes.
17+
18+
## Definitions
19+
20+
Harassment includes, but is not limited to:
21+
22+
- Offensive comments related to gender, gender identity and expression, sexual orientation, disability, mental illness, neuro(a)typicality, physical appearance, body size, race, age, regional discrimination, political or religious affiliation
23+
- Unwelcome comments regarding a person’s lifestyle choices and practices, including those related to food, health, parenting, drugs, and employment
24+
- Deliberate misgendering. This includes deadnaming or persistently using a pronoun that does not correctly reflect a person's gender identity. You must address people by the name they give you when not addressing them by their username or handle
25+
- Physical contact and simulated physical contact (eg, textual descriptions like “*hug*” or “*backrub*”) without consent or after a request to stop
26+
- Threats of violence, both physical and psychological
27+
- Incitement of violence towards any individual, including encouraging a person to commit suicide or to engage in self-harm
28+
- Deliberate intimidation
29+
- Stalking or following
30+
- Harassing photography or recording, including logging online activity for harassment purposes
31+
- Sustained disruption of discussion
32+
- Unwelcome sexual attention, including gratuitous or off-topic sexual images or behaviour
33+
- Pattern of inappropriate social contact, such as requesting/assuming inappropriate levels of intimacy with others
34+
- Continued one-on-one communication after requests to cease
35+
- Deliberate “outing” of any aspect of a person’s identity without their consent except as necessary to protect others from intentional abuse
36+
- Publication of non-harassing private communication
37+
38+
We will not act on complaints regarding:
39+
40+
- Good faith and non-malicious conduct whose object is to ameliorate the conditions of disadvantaged individuals or groups including those that are disadvantaged because of race, national or ethnic origin, colour, religion, sex, age or mental or physical disability.
41+
- Reasonable communication of boundaries, such as “leave me alone,” “go away,” or “I’m not discussing this with you”
42+
- Refusal to explain or debate social justice concepts
43+
- Communicating in a ‘tone’ you don’t find congenial
44+
- Criticizing racist, sexist, cissexist, or otherwise oppressive behaviour or assumptions
45+
46+
### Diversity Statement
47+
48+
We encourage everyone to participate and are committed to building a community for all. Although we will fail at times, we seek to treat everyone both as fairly and equally as possible. Whenever a participant has made a mistake, we expect them to take responsibility for it. If someone has been harmed or offended, it is our responsibility to listen carefully and respectfully, and do our best to right the wrong.
49+
50+
Although this list cannot be exhaustive, we explicitly honour diversity in age, gender, gender identity or expression, culture, ethnicity, language, national origin, political beliefs, profession, race, religion, sexual orientation, socioeconomic status, and technical ability. We will not tolerate discrimination based on any of the protected
51+
characteristics above, including participants with disabilities.
52+
53+
Matrix.org and The Matrix.org Foundation takes a position on acceptable behaviour for its community as defined by the CoC, and we will not endorse behaviour which is counter to that. Matrix.org does not have a mandate to promote content which is associated with an entity whose position is incompatible with this CoC.
54+
55+
### Reporting Issues
56+
57+
If you experience or witness unacceptable behaviour — or have any other concerns — please report it by contacting us via [email protected]. All reports will be handled with discretion. In your report please include:
58+
59+
- Your contact information.
60+
- Names (usernames and nicks, real names, and/or pseudonyms) of any individuals involved. If there are additional witnesses, please
61+
include them as well. Your account of what occurred, and if you believe the incident is ongoing.
62+
- The date and time of the incident (or start of incident).
63+
- Any additional information that may be helpful.
64+
65+
After filing a report, a representative will contact you personally, review the incident, follow up with any additional questions, and make a decision as to how to respond. If the person who is harassing you is part of the response team, they will recuse themselves from handling your incident. If the complaint originates from a member of the response team, it will be handled by a different member of the response team. We will respect confidentiality requests for the purpose of protecting victims of abuse.
66+
67+
### Attribution & Acknowledgements
68+
69+
This Code of Conduct is based on the [TODO Group](https://twitter.com/todogroup)'s [Open Code of Conduct template](https://github.com/todogroup/opencodeofconduct), but with some modifications.

‎content/legal/copyright-notice.md

+103
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
+++
2+
title = "Matrix.org Copyright Notice"
3+
+++
4+
5+
Where you read *New Vector*, *New Vector Ltd.* or *we *or* us* below, it refers
6+
to the company we created in July 2017 to hire the Matrix core team and support
7+
Matrix’s development and so run the matrix.org homeserver: New Vector Ltd., and
8+
its French subsidiary: New Vector SARL and their agents.
9+
10+
When you read ‘the matrix.org homeserver’ or ‘the Service’ below, it refers to
11+
the services made available at **matrix.org** which store your account and
12+
personal conversation history, provide services such as bots and bridges, and
13+
communicate via the open Matrix decentralised communication protocol with the
14+
public Matrix Network.
15+
16+
If the terms of this copyright notice are not acceptable, please use a Matrix
17+
server provided by someone else!
18+
19+
## Reporting Claims of Copyright Infringement
20+
21+
We take claims of copyright infringement seriously. This policy deals with what
22+
to do if you believe that any user contributions violate your copyright. It is
23+
our policy to terminate the user accounts of repeat infringers.
24+
25+
We will respond to notices of alleged copyright infringement that comply with
26+
applicable law. If you believe any materials accessible via the Service
27+
infringe your copyright, you may request removal of those materials (or access
28+
to them) from the Service by submitting written notification to our Copyright
29+
Agent (designated below). In accordance with the Online Copyright Infringement
30+
Liability Limitation Act of the Digital Millennium Copyright Act (17 U.S.C. §
31+
512) ("DMCA"), the written notice (the “DMCA Notice”) must include
32+
substantially the following:
33+
34+
- Your physical or electronic signature.
35+
- Identification of the copyrighted work you believe to have been infringed or,
36+
if the claim involves multiple works on the Website or in connection with the
37+
Services, a representative list of such works.
38+
- Identification of the material you believe to be infringing in a sufficiently
39+
precise manner to allow us to locate that material.
40+
- Adequate information by which we can contact you (including your name, postal
41+
address, telephone number and, if available, email address).
42+
- A statement that you have a good faith belief that use of the copyrighted
43+
material is not authorized by the copyright owner, its agent or the law.
44+
- A statement that the information in the written notice is accurate.
45+
- A statement, under penalty of perjury, that you are authorized to act on
46+
behalf of the copyright owner.
47+
48+
Our designated Copyright Agent to receive DMCA Notices is:
49+
50+
Matthew Hodgson\
51+
10 Queen Street Place\
52+
London\
53+
United Kingdom\
54+
EC4R 1AG
55+
56+
By email: [email protected]
57+
58+
If you fail to comply with all of the requirements of Section 512(c)(3) of the
59+
DMCA, your DMCA Notice may not be effective.
60+
61+
Please be aware that if you knowingly materially misrepresent that material or
62+
activity on the Website or in connection with the Services is infringing your
63+
copyright, you may be held liable for damages (including costs and attorneys'
64+
fees) under Section 512(f) of the DMCA.
65+
66+
### Counter-notification procedures
67+
68+
If you believe that material you posted on the Website or using the Services was
69+
removed or access to it was disabled by mistake or misidentification, you may
70+
file a counter-notification with us (a "Counter-Notice") by submitting written
71+
notification to our Copyright Agent. Pursuant to the DMCA, the Counter-Notice
72+
must include substantially the following:
73+
74+
- Your physical or electronic signature.
75+
- An identification of the material that has been removed or to which access has
76+
been disabled and the location at which the material appeared before it was
77+
removed or access disabled.
78+
- Adequate information by which we can contact you (including your name, postal
79+
address, telephone number and, if available, email address).
80+
- A statement under penalty of perjury by you that you have a good faith belief
81+
that the material identified above was removed or disabled as a result of a
82+
mistake or misidentification of the material to be removed or disabled.
83+
- A statement that you will consent to the jurisdiction of the Federal District
84+
Court for the judicial district in which your address is located (or if you
85+
reside outside the United States for any judicial district in which the
86+
Website or Services may be found) and that you will accept service from the
87+
person (or an agent of that person) who provided the Website or Services with
88+
the complaint at issue.
89+
90+
The DMCA allows us to restore the removed content if the party filing the
91+
original DMCA Notice does not file a court action against you within ten
92+
business days of receiving the copy of your Counter-Notice.
93+
94+
Please be aware that if you knowingly materially misrepresent that material or
95+
activity on the Website or provided in connection with the Services was removed
96+
or disabled by mistake or misidentification, you may be held liable for
97+
damages (including costs and attorneys' fees) under Section 512(f) of the
98+
DMCA.
99+
100+
### Repeat infringers
101+
102+
It is our policy in appropriate circumstances to disable and/or terminate the
103+
accounts of users who are repeat infringers.

0 commit comments

Comments
 (0)