free
/
freedombone
Obserwuj 1
Gwiazdka 0
Forkuj 0
Kod Problemy 0 Pull Requests 0 Wydania 0 Wiki Aktywność
Przeglądaj źródła

Public and private concerns

Bob Mottram 7 lat temu
rodzic
7668c4531c
commit
e0d51c3e22
3 zmienionych plików z 12 dodań i 4 usunięć
Zunifikowany widok Pokaż statystyki zmian
  1. 3
    1
      code-of-conduct.md
  2. 3
    1
      doc/EN/codeofconduct.org
  3. 6
    2
      website/EN/codeofconduct.html

+ 3
- 1
code-of-conduct.md Wyświetl plik

52
52
53 
 This is not a big project and so there is no division of labor or special enforcement committee or bureaucratic process.
 53 
 This is not a big project and so there is no division of labor or special enforcement committee or bureaucratic process.
54
54
55 
-Complaints should be made in private to bob@freedombone.net, preferably via XMPP/Conversations with OMEMO enabled but you can also use the same address for email correspondence. If you're using email and have GPG capability the public key [can be found here](./support.html). XMPP messages are likely to get the quickest response.
55 
+If your concern is something which is suitable for public discussion then raise it in one of the chat rooms mentioned above. Be mindful to do so in a polite and considerate manner. Hostile communication towards anyone raising concerns publicly will be considered a code of conduct violation.
56 
+
57 
+Private complaints should be sent to bob@freedombone.net, preferably via XMPP/Conversations with OMEMO enabled but you can also use the same address for email correspondence. If you're using email and have GPG capability the public key [can be found here](./support.html). XMPP messages are likely to get the quickest response.
56
58
57 
 ## In case of violations
 59 
 ## In case of violations
58
60

+ 3
- 1
doc/EN/codeofconduct.org Wyświetl plik

55
55
56 
 This is not a big project and so there is no division of labor or special enforcement committee or bureaucratic process.
 56 
 This is not a big project and so there is no division of labor or special enforcement committee or bureaucratic process.
57
57
58 
-Complaints should be made in private to bob@freedombone.net, preferably via XMPP/Conversations with OMEMO enabled but you can also use the same address for email correspondence. If you're using email and have GPG capability the public key [[./support.html][can be found here]]. XMPP messages are likely to get the quickest response.
58 
+If your concern is something which is suitable for public discussion then raise it in one of the chat rooms mentioned above. Be mindful to do so in a polite and considerate manner. Hostile communication towards anyone raising concerns publicly will be considered a code of conduct violation.
59 
+
60 
+Private complaints should be sent to bob@freedombone.net, preferably via XMPP/Conversations with OMEMO enabled but you can also use the same address for email correspondence. If you're using email and have GPG capability the public key [[./support.html][can be found here]]. XMPP messages are likely to get the quickest response.
59
61
60 
 * In case of violations
 62 
 * In case of violations
61
63

+ 6
- 2
website/EN/codeofconduct.html Wyświetl plik

4 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 4 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5 
 <head>
 5 
 <head>
6 
 <title></title>
 6 
 <title></title>
7 
-<!-- 2018-06-22 Fri 16:52 -->
7 
+<!-- 2018-06-22 Fri 17:07 -->
8 
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
 8 
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
9 
 <meta  name="generator" content="Org-mode" />
 9 
 <meta  name="generator" content="Org-mode" />
10 
 <meta  name="author" content="Bob Mottram" />
 10 
 <meta  name="author" content="Bob Mottram" />
264 
 </p>
 264 
 </p>
265
265
266 
 <p>
 266 
 <p>
267 
-Complaints should be made in private to bob@freedombone.net, preferably via XMPP/Conversations with OMEMO enabled but you can also use the same address for email correspondence. If you're using email and have GPG capability the public key <a href="./support.html">can be found here</a>. XMPP messages are likely to get the quickest response.
267 
+If your concern is something which is suitable for public discussion then raise it in one of the chat rooms mentioned above. Be mindful to do so in a polite and considerate manner. Hostile communication towards anyone raising concerns publicly will be considered a code of conduct violation.
268 
+</p>
269 
+
270 
+<p>
271 
+Private complaints should be sent to bob@freedombone.net, preferably via XMPP/Conversations with OMEMO enabled but you can also use the same address for email correspondence. If you're using email and have GPG capability the public key <a href="./support.html">can be found here</a>. XMPP messages are likely to get the quickest response.
268 
 </p>
 272 
 </p>
269 
 </div>
 273 
 </div>
270 
 </div>
 274 
 </div>