Skip to content
Snippets Groups Projects
Commit ebdaa2dd authored by Martyn Welch's avatar Martyn Welch
Browse files

Remove duplicate code of conduct


There are 2 code of conduct pages with idential information, remove one.

Simplify the title and ensure old wiki link retained in remaining page.

Signed-off-by: default avatarMartyn Welch <martyn.welch@collabora.com>
parent e0947df9
No related branches found
No related tags found
1 merge request!1Wip/martyn/t6720
+++ +++
date = "2015-11-04" date = "2015-12-16"
weight = 100 weight = 100
title = "Apertis:Code of conduct" title = "Code of conduct"
aliases = [ aliases = [
"/old-wiki/Apertis:Code_of_conduct" "/old-wiki/Apertis:Code_of_conduct",
"/old-wiki/Apertis:Code_of_conductpage"
] ]
+++ +++
...@@ -48,4 +49,4 @@ You can approach the following people for help: ...@@ -48,4 +49,4 @@ You can approach the following people for help:
## Credits ## Credits
*The first version of this page was based on a code of conduct by *The first version of this page was based on a code of conduct by
Allison Ryan Lortie \<desrt@desrt.ca\>* Allison Ryan Lortie \<desrt@desrt.ca\>*
\ No newline at end of file
+++
date = "2015-12-16"
weight = 100
title = "Apertis:Code of conductpage"
aliases = [
"/old-wiki/Apertis:Code_of_conductpage"
]
+++
This text documents what you can expect from the Apertis community
online and at events and, in turn, what we expect from you.
We believe that people generally mean well. Excepting strong evidence to
the contrary, we ask that you do the same. We favour communication over
confrontation. Most issues that arise during day-to-day contribution to
any software project and at events can be resolved by communication
between the affected parties.
People make mistakes. Good people are capable of engaging in thoughtless
actions and are capable of making thoughtless remarks. Sometimes these
actions and words cross a line. Even if you are not yourself offended by
this behaviour, we ask that you discretely remind people that others may
be. We do not engage in public shaming of any kind and we ask the same
from you.
We expect everyone to treat others with respect, no matter their level
of contribution to the project.
In the event of serious offences or in case you do not feel comfortable
confronting someone yourself, some individuals that you can approach for
help can be designated. These people can help mediate conflicts or can
simply take an individual aside and let them know that their behaviour
was unacceptable. Your privacy will be maintained to the degree that you
request. In very serious situations, we will help you with contacting
the local police and filing a report where possible.
Apertis does not engage in discrimination. Everyone is welcome in all
community communication channels and at all events.
## Who can I approach?
You can approach the following people for help:
- Ekaterina Gerasimova \<ekaterina.gerasimova@collabora.co.uk\>
## Credits
*The first version of this page was based on a code of conduct by
Allison Ryan Lortie \<desrt@desrt.ca\>*
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment