7 年前 · f3e847e886
--- a/code-of-conduct.md
+++ b/code-of-conduct.md
 
															 If you're discussing an issue or bug, try to stay on topic, especially in discussions that are already fairly large.
														
 
															-## Be open
														
 
															+## Public discussions
														
 
															-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.
														
 
															-
														
 
															-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.
														
 
															+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.
														
 
															 ## No spamming
														
--- a/doc/EN/codeofconduct.org
+++ b/doc/EN/codeofconduct.org
 
															 If you're discussing an issue or bug, try to stay on topic, especially in discussions that are already fairly large.
														
 
															-* Be open
														
 
															+* Public discussions
														
 
															-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.
														
 
															-
														
 
															-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.
														
 
															+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.
														
 
															 * No spamming
														
 
															 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.
														
--- a/website/EN/codeofconduct.html
+++ b/website/EN/codeofconduct.html
 
															 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
														
 
															 <head>
														
 
															 <title></title>
														
 
															-<!-- 2018-06-22 Fri 15:41 -->
														
 
															+<!-- 2018-06-22 Fri 16:12 -->
														
 
															 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
														
 
															 <meta  name="generator" content="Org-mode" />
														
 
															 <meta  name="author" content="Bob Mottram" />
														
 
															 </div>
														
 
															 <div id="outline-container-sec-6" class="outline-2">
														
 
															-<h2 id="sec-6">Be open</h2>
														
 
															+<h2 id="sec-6">Public discussions</h2>
														
 
															 <div class="outline-text-2" id="text-6">
														
 
															 <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>
														
 
															-
														
 
															-<p>
														
 
															-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.
														
 
															+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.
														
 
															 </p>
														
 
															 </div>
														
 
															 </div>