free
/
freedombone
Seguir 1
Destacar 0
Cuchillo 0
Código Incidencias 0 Peticiones pull 0 Lanzamientos 0 Wiki Activity
Explorar el Código

Public and private concerns

Bob Mottram hace 6 años
padre
7668c4531c
commit
e0d51c3e22
Se han modificado 3 ficheros con 12 adiciones y 4 borrados
Dividir vista Mostrar estadísticas de diff
  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 Ver fichero 

@@ -52,7 +52,9 @@ This is a Free Software project and there is no intention to support or endorse
52 52
53 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 59 
 ## In case of violations
58 60

+ 3
- 1
doc/EN/codeofconduct.org Ver fichero 

@@ -55,7 +55,9 @@ This is a Free Software project and there is no intention to support or endorse
55 55
56 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 62 
 * In case of violations
61 63

+ 6
- 2
website/EN/codeofconduct.html Ver fichero 

@@ -4,7 +4,7 @@
4 4 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5 5 
 <head>
6 6 
 <title></title>
7 
-<!-- 2018-06-22 Fri 16:52 -->
7 
+<!-- 2018-06-22 Fri 17:07 -->
8 8 
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
9 9 
 <meta  name="generator" content="Org-mode" />
10 10 
 <meta  name="author" content="Bob Mottram" />
 
@@ -264,7 +264,11 @@ This is not a big project and so there is no division of labor or special enforc
264 264 
 </p>
265 265
266 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 272 
 </p>
269 273 
 </div>
270 274 
 </div>