free
/
freedombone
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

More direct information about chat room

Bob Mottram 6 years ago
parent
90172ae856
commit
f3e847e886
3 changed files with 7 additions and 15 deletions
Unified View Show Diff Stats
  1. 2
    4
      code-of-conduct.md
  2. 2
    4
      doc/EN/codeofconduct.org
  3. 3
    7
      website/EN/codeofconduct.html

+ 2
- 4
code-of-conduct.md View File

20
20
21 
 If you're discussing an issue or bug, try to stay on topic, especially in discussions that are already fairly large.
 21 
 If you're discussing an issue or bug, try to stay on topic, especially in discussions that are already fairly large.
22
22
23 
-## Be open
23 
+## Public discussions
24
24
25 
-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.
26 
-
27 
-This applies to messages for help, too; not only is a public support request much more likely to result in an answer to your question, it also makes sure that any inadvertent mistakes made by people answering your question will be more easily detected and corrected.
25 
+For public discussions about the project use the Matrix room *#fbone:matrix.freedombone.net* or the XMPP support conference at *support@chat.freedombone.net*. The XMPP conference might require an invite and you can get one via request from bob@freedombone.net, either via email or via XMPP with OMEMO.
28
26
29 
 ## No spamming
 27 
 ## No spamming
30
28

+ 2
- 4
doc/EN/codeofconduct.org View File

31
31
32 
 If you're discussing an issue or bug, try to stay on topic, especially in discussions that are already fairly large.
 32 
 If you're discussing an issue or bug, try to stay on topic, especially in discussions that are already fairly large.
33
33
34 
-* Be open
34 
+* Public discussions
35
35
36 
-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.
37 
-
38 
-This applies to messages for help, too; not only is a public support request much more likely to result in an answer to your question, it also makes sure that any inadvertent mistakes made by people answering your question will be more easily detected and corrected.
36 
+For public discussions about the project use the Matrix room *#fbone:matrix.freedombone.net* or the XMPP support conference at *support@chat.freedombone.net*. The XMPP conference might require an invite and you can get one via request from bob@freedombone.net, either via email or via XMPP with OMEMO.
39
37
40 
 * No spamming
 38 
 * No spamming
41 
 Posting of adverts or other off-topic content in Matrix/XMPP or other public systems used by the project will be considered a violation of the code of conduct.
 39 
 Posting of adverts or other off-topic content in Matrix/XMPP or other public systems used by the project will be considered a violation of the code of conduct.

+ 3
- 7
website/EN/codeofconduct.html View File

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 15:41 -->
7 
+<!-- 2018-06-22 Fri 16:12 -->
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" />
200 
 </div>
 200 
 </div>
201
201
202 
 <div id="outline-container-sec-6" class="outline-2">
 202 
 <div id="outline-container-sec-6" class="outline-2">
203 
-<h2 id="sec-6">Be open</h2>
203 
+<h2 id="sec-6">Public discussions</h2>
204 
 <div class="outline-text-2" id="text-6">
 204 
 <div class="outline-text-2" id="text-6">
205 
 <p>
 205 
 <p>
206 
-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.
207 
-</p>
208 
-
209 
-<p>
210 
-This applies to messages for help, too; not only is a public support request much more likely to result in an answer to your question, it also makes sure that any inadvertent mistakes made by people answering your question will be more easily detected and corrected.
206 
+For public discussions about the project use the Matrix room <b>#fbone:matrix.freedombone.net</b> or the XMPP support conference at <b>support@chat.freedombone.net</b>. The XMPP conference might require an invite and you can get one via request from bob@freedombone.net, either via email or via XMPP with OMEMO.
211 
 </p>
 207 
 </p>
212 
 </div>
 208 
 </div>
213 
 </div>
 209 
 </div>