6 年之前 · e0d51c3e22
--- a/code-of-conduct.md
+++ b/code-of-conduct.md
 
															 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 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.
														
 
															+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.
														
 
															+
														
 
															+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.
														
 
															 ## In case of violations
														
--- a/doc/EN/codeofconduct.org
+++ b/doc/EN/codeofconduct.org
 
															 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 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.
														
 
															+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.
														
 
															+
														
 
															+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.
														
 
															 * In case of violations
														
--- 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 16:52 -->
														
 
															+<!-- 2018-06-22 Fri 17:07 -->
														
 
															 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
														
 
															 <meta  name="generator" content="Org-mode" />
														
 
															 <meta  name="author" content="Bob Mottram" />
														
 
															 </p>
														
 
															 <p>
														
 
															-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.
														
 
															+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.
														
 
															+</p>
														
 
															+
														
 
															+<p>
														
 
															+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.
														
 
															 </p>
														
 
															 </div>
														
 
															 </div>