Kaynağa Gözat

Some coc clarification

Bob Mottram 7 yıl önce
ebeveyn
işleme
7fb85ec54d
3 değiştirilmiş dosya ile 25 ekleme ve 25 silme
  1. 2
    2
      code-of-conduct.md
  2. 2
    2
      doc/EN/codeofconduct.org
  3. 21
    21
      website/EN/codeofconduct.html

+ 2
- 2
code-of-conduct.md Dosyayı Görüntüle

@@ -30,6 +30,6 @@ This applies to messages for help, too; not only is a public support request muc
30 30
 
31 31
 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.
32 32
 
33
-Serious or persistent offenders will be kicked from chat rooms and any of their subsequent patches will be unlikely to be upstreamed.
33
+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.
34 34
 
35
-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.
35
+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.

+ 2
- 2
doc/EN/codeofconduct.org Dosyayı Görüntüle

@@ -44,6 +44,6 @@ This applies to messages for help, too; not only is a public support request muc
44 44
 
45 45
 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.
46 46
 
47
-Serious or persistent offenders will be kicked from chat rooms and any of their subsequent patches will be unlikely to be upstreamed.
47
+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.
48 48
 
49
-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.
49
+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.

+ 21
- 21
website/EN/codeofconduct.html Dosyayı Görüntüle

@@ -3,7 +3,7 @@
3 3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
4 4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5 5
 <head>
6
-<!-- 2017-12-20 Wed 12:45 -->
6
+<!-- 2017-12-29 Fri 10:25 -->
7 7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
8 8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
9 9
 <title>&lrm;</title>
@@ -246,27 +246,27 @@ for the JavaScript code in this tag.
246 246
 
247 247
 <center><h1>Code of Conduct</h1></center>
248 248
 
249
-<div id="outline-container-orga839710" class="outline-2">
250
-<h2 id="orga839710">Be respectful</h2>
251
-<div class="outline-text-2" id="text-orga839710">
249
+<div id="outline-container-org7389049" class="outline-2">
250
+<h2 id="org7389049">Be respectful</h2>
251
+<div class="outline-text-2" id="text-org7389049">
252 252
 <p>
253 253
 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.
254 254
 </p>
255 255
 </div>
256 256
 </div>
257 257
 
258
-<div id="outline-container-org890f143" class="outline-2">
259
-<h2 id="org890f143">Assume good faith</h2>
260
-<div class="outline-text-2" id="text-org890f143">
258
+<div id="outline-container-orgb4a8701" class="outline-2">
259
+<h2 id="orgb4a8701">Assume good faith</h2>
260
+<div class="outline-text-2" id="text-orgb4a8701">
261 261
 <p>
262 262
 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.
263 263
 </p>
264 264
 </div>
265 265
 </div>
266 266
 
267
-<div id="outline-container-orgccafefb" class="outline-2">
268
-<h2 id="orgccafefb">Be collaborative</h2>
269
-<div class="outline-text-2" id="text-orgccafefb">
267
+<div id="outline-container-org323e1d5" class="outline-2">
268
+<h2 id="org323e1d5">Be collaborative</h2>
269
+<div class="outline-text-2" id="text-org323e1d5">
270 270
 <p>
271 271
 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.
272 272
 </p>
@@ -277,9 +277,9 @@ When you make something for the benefit of the project, be willing to explain to
277 277
 </div>
278 278
 </div>
279 279
 
280
-<div id="outline-container-org960241b" class="outline-2">
281
-<h2 id="org960241b">Try to be concise</h2>
282
-<div class="outline-text-2" id="text-org960241b">
280
+<div id="outline-container-org2247eb7" class="outline-2">
281
+<h2 id="org2247eb7">Try to be concise</h2>
282
+<div class="outline-text-2" id="text-org2247eb7">
283 283
 <p>
284 284
 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.
285 285
 </p>
@@ -290,9 +290,9 @@ If you're discussing an issue or bug, try to stay on topic, especially in discus
290 290
 </div>
291 291
 </div>
292 292
 
293
-<div id="outline-container-orgd3249bd" class="outline-2">
294
-<h2 id="orgd3249bd">Be open</h2>
295
-<div class="outline-text-2" id="text-orgd3249bd">
293
+<div id="outline-container-org9d2afa5" class="outline-2">
294
+<h2 id="org9d2afa5">Be open</h2>
295
+<div class="outline-text-2" id="text-org9d2afa5">
296 296
 <p>
297 297
 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.
298 298
 </p>
@@ -303,19 +303,19 @@ This applies to messages for help, too; not only is a public support request muc
303 303
 </div>
304 304
 </div>
305 305
 
306
-<div id="outline-container-org8f9612f" class="outline-2">
307
-<h2 id="org8f9612f">In case of problems</h2>
308
-<div class="outline-text-2" id="text-org8f9612f">
306
+<div id="outline-container-orgeac99f0" class="outline-2">
307
+<h2 id="orgeac99f0">In case of problems</h2>
308
+<div class="outline-text-2" id="text-orgeac99f0">
309 309
 <p>
310 310
 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.
311 311
 </p>
312 312
 
313 313
 <p>
314
-Serious or persistent offenders will be kicked from chat rooms and any of their subsequent patches will be unlikely to be upstreamed.
314
+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.
315 315
 </p>
316 316
 
317 317
 <p>
318
-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.
318
+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.
319 319
 </p>
320 320
 </div>
321 321
 </div>