free
/
freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some coc clarification

This commit is contained in:
Bob Mottram 2017-12-29 10:25:32 +00:00
parent 0d52e513cb
commit 7fb85ec54d
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code-of-conduct.md
View File

@ -30,6 +30,6 @@ This applies to messages for help, too; not only is a public support request muc
While this code of conduct should be adhered to by participants, we recognize that sometimes people may have a bad day, or be unaware of some of the guidelines in this code of conduct. When that happens, you may reply to them and point out this code of conduct. Such messages may be in public or in private, whatever is most appropriate. However, regardless of whether the message is public or not, it should still adhere to the relevant parts of this code of conduct; in particular, it should not be abusive or disrespectful. Assume good faith; it is more likely that participants are unaware of their bad behaviour than that they intentionally try to degrade the quality of the discussion.
Serious or persistent offenders will be kicked from chat rooms and any of their subsequent patches will be unlikely to be upstreamed.
Serious or persistent offenders will be kicked from chat rooms and any of their subsequent patches will be unlikely to be upstreamed. In this context "serious" means that someone is causing others to feel unsafe or be unable to contribute, for whatever reason.
Complaints should be made (in private) to the maintainer or chat room admin. The typical email address can be found in the source code headers. Preferably use GPG/OpenPGP if you can, or XMPP with OTR/OMEMO to bob@freedombone.net.
This is not a big project and so there is no division of labor or special enforcement committee or bureaucratic process. Complaints should be made (in private) to the maintainer or chat room admin. The typical email address can be found in the source code headers. Preferably use GPG/OpenPGP if you can, or XMPP with OTR/OMEMO to bob@freedombone.net. XMPP messages are likely to get a quicker response.

4
doc/EN/codeofconduct.org
View File

@ -44,6 +44,6 @@ This applies to messages for help, too; not only is a public support request muc
While this code of conduct should be adhered to by participants, we recognize that sometimes people may have a bad day, or be unaware of some of the guidelines in this code of conduct. When that happens, you may reply to them and point out this code of conduct. Such messages may be in public or in private, whatever is most appropriate. However, regardless of whether the message is public or not, it should still adhere to the relevant parts of this code of conduct; in particular, it should not be abusive or disrespectful. Assume good faith; it is more likely that participants are unaware of their bad behaviour than that they intentionally try to degrade the quality of the discussion.
Serious or persistent offenders will be kicked from chat rooms and any of their subsequent patches will be unlikely to be upstreamed.
Serious or persistent offenders will be kicked from chat rooms and any of their subsequent patches will be unlikely to be upstreamed. In this context "serious" means that someone is causing others to feel unsafe or be unable to contribute, for whatever reason.
Complaints should be made (in private) to the maintainer or chat room admin. The typical email address can be found in the source code headers. Preferably use GPG/OpenPGP if you can, or XMPP with OTR/OMEMO to bob@freedombone.net.
This is not a big project and so there is no division of labor or special enforcement committee or bureaucratic process. Complaints should be made (in private) to the maintainer or chat room admin. The typical email address can be found in the source code headers. Preferably use GPG/OpenPGP if you can, or XMPP with OTR/OMEMO to bob@freedombone.net. XMPP messages are likely to get a quicker response.

42
website/EN/codeofconduct.html
View File

@ -3,7 +3,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<!-- 2017-12-20 Wed 12:45 -->
<!-- 2017-12-29 Fri 10:25 -->
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>&lrm;</title>
@ -246,27 +246,27 @@ for the JavaScript code in this tag.
<center><h1>Code of Conduct</h1></center>
<div id="outline-container-orga839710" class="outline-2">
<h2 id="orga839710">Be respectful</h2>
<div class="outline-text-2" id="text-orga839710">
<div id="outline-container-org7389049" class="outline-2">
<h2 id="org7389049">Be respectful</h2>
<div class="outline-text-2" id="text-org7389049">
<p>
In any Free Software project with more than one participant inevitably there may be people with whom you may disagree, or find it difficult to cooperate. Accept that, but even so, remain respectful. Disagreement is no excuse for poor behaviour or personal attacks, and a community in which people feel threatened is not a healthy community.
</p>
</div>
</div>
<div id="outline-container-org890f143" class="outline-2">
<h2 id="org890f143">Assume good faith</h2>
<div class="outline-text-2" id="text-org890f143">
<div id="outline-container-orgb4a8701" class="outline-2">
<h2 id="orgb4a8701">Assume good faith</h2>
<div class="outline-text-2" id="text-orgb4a8701">
<p>
Freedombone Contributors have many ways of reaching our common goal of providing freedom respecting internet or mesh systems which may differ from your ways. Assume that other people are working towards this goal.
</p>
</div>
</div>
<div id="outline-container-orgccafefb" class="outline-2">
<h2 id="orgccafefb">Be collaborative</h2>
<div class="outline-text-2" id="text-orgccafefb">
<div id="outline-container-org323e1d5" class="outline-2">
<h2 id="org323e1d5">Be collaborative</h2>
<div class="outline-text-2" id="text-org323e1d5">
<p>
Freedombone is a moderately complex project, though nothing big and professional like GNU. It's good to ask for help when you need it. Similarly, offers for help should be seen in the context of our shared goal of improving the system.
</p>
@ -277,9 +277,9 @@ When you make something for the benefit of the project, be willing to explain to
</div>
</div>
<div id="outline-container-org960241b" class="outline-2">
<h2 id="org960241b">Try to be concise</h2>
<div class="outline-text-2" id="text-org960241b">
<div id="outline-container-org2247eb7" class="outline-2">
<h2 id="org2247eb7">Try to be concise</h2>
<div class="outline-text-2" id="text-org2247eb7">
<p>
If you're submitting documentation then keep in mind that what you write once could be read by many other people. To avoid TL;DR keep it as short and concise as possible. This will also reduce the amount of translations effort needed.
</p>
@ -290,9 +290,9 @@ If you're discussing an issue or bug, try to stay on topic, especially in discus
</div>
</div>
<div id="outline-container-orgd3249bd" class="outline-2">
<h2 id="orgd3249bd">Be open</h2>
<div class="outline-text-2" id="text-orgd3249bd">
<div id="outline-container-org9d2afa5" class="outline-2">
<h2 id="org9d2afa5">Be open</h2>
<div class="outline-text-2" id="text-org9d2afa5">
<p>
Most ways of communication used within Freedombone (eg Matrix/XMPP) allow for public and private communication. Prefer public methods of communication for Freedombone-related messages, unless posting something sensitive.
</p>
@ -303,19 +303,19 @@ This applies to messages for help, too; not only is a public support request muc
</div>
</div>
<div id="outline-container-org8f9612f" class="outline-2">
<h2 id="org8f9612f">In case of problems</h2>
<div class="outline-text-2" id="text-org8f9612f">
<div id="outline-container-orgeac99f0" class="outline-2">
<h2 id="orgeac99f0">In case of problems</h2>
<div class="outline-text-2" id="text-orgeac99f0">
<p>
While this code of conduct should be adhered to by participants, we recognize that sometimes people may have a bad day, or be unaware of some of the guidelines in this code of conduct. When that happens, you may reply to them and point out this code of conduct. Such messages may be in public or in private, whatever is most appropriate. However, regardless of whether the message is public or not, it should still adhere to the relevant parts of this code of conduct; in particular, it should not be abusive or disrespectful. Assume good faith; it is more likely that participants are unaware of their bad behaviour than that they intentionally try to degrade the quality of the discussion.
</p>
<p>
Serious or persistent offenders will be kicked from chat rooms and any of their subsequent patches will be unlikely to be upstreamed.
Serious or persistent offenders will be kicked from chat rooms and any of their subsequent patches will be unlikely to be upstreamed. In this context "serious" means that someone is causing others to feel unsafe or be unable to contribute, for whatever reason.
</p>
<p>
Complaints should be made (in private) to the maintainer or chat room admin. The typical email address can be found in the source code headers. Preferably use GPG/OpenPGP if you can, or XMPP with OTR/OMEMO to bob@freedombone.net.
This is not a big project and so there is no division of labor or special enforcement committee or bureaucratic process. Complaints should be made (in private) to the maintainer or chat room admin. The typical email address can be found in the source code headers. Preferably use GPG/OpenPGP if you can, or XMPP with OTR/OMEMO to bob@freedombone.net. XMPP messages are likely to get a quicker response.
</p>
</div>
</div>