Add knowledge base entry about channel namespaces

[irc/freenode/web-7.0.git] / content / kb / general / conduct.md

diff --git a/content/kb/general/conduct.md b/content/kb/general/conduct.md
index 4720a8763257c65a4a03a17d6b712d4be977077d..9bf253775a91da5e4aa4e863000f4779c0843338 100755 (executable)
--- a/content/kb/general/conduct.md
+++ b/content/kb/general/conduct.md
@@ -1,9 +1,15 @@
 Title: General Expectations for Conduct
 ---
-In addition to the general [policies](pages/policy) governing behaviour when using freenode, we strongly encourage all participants to adopt the [channel
-guidelines](pages/changuide) and [philosophy](pages/philosophy) to help keep the network a friendly and productive place.
+In addition to the general [policies](pages/policies) governing behaviour when
+using freenode, we strongly encourage all participants to adopt the [channel
+guidelines](pages/changuide) and [philosophy](pages/philosophy) to help keep
+the network a friendly and productive place.
 
 In particular, we would urge all users to keep the following in mind:
-- We expect all users to act in good faith at all times, and this includes assuming the same of others. Where another user's behaviour admits several
-  interpretations, work on the basis of the most charitable one until you have strong evidence to the contrary.
-- freenode aims to be welcoming and inclusive, and so we do not accept any form of discrimination based on gender, race, sexuality or beliefs.
+
+- We expect all users to act in good faith at all times, and this includes
+  assuming the same of others. Where another user's behaviour admits several
+  interpretations, work on the basis of the most charitable one until you have
+  strong evidence to the contrary.
+- freenode aims to be welcoming, inclusive, and non-discriminatory and we 
+  encourage everyone to be tolerant and respectful of others.