lopcode · July 20, 2017 17:37 · Jul 20, 2017 · Jul 20, 2017 · Jul 20, 2017 · Jul 20, 2017
diff --git a/code-of-conduct.md b/code-of-conduct.md
@@ -20,4 +20,4 @@ If you feel that another person is violating the rule, or you have other concern
 
 # License
 
-For the avoidance of doubt, this code of conduct is [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/) licensed - copy it, change it, and credit me.
+For the avoidance of doubt, this code of conduct is [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/) licensed - copy it, change it, and credit me (tag my GitHub / Twitter profile preferably). 🐰❤️
diff --git a/code-of-conduct.md b/code-of-conduct.md
@@ -20,4 +20,4 @@ If you feel that another person is violating the rule, or you have other concern
 
 # License
 
-For the avoidance of doubt, this code of conduct is [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/) - copy it, change it, and credit me.
+For the avoidance of doubt, this code of conduct is [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/) licensed - copy it, change it, and credit me.
diff --git a/code-of-conduct.md b/code-of-conduct.md
@@ -20,22 +20,4 @@ If you feel that another person is violating the rule, or you have other concern
 
 # License
 
-For the avoidance of doubt, this code of conduct is [ISC Licensed](https://choosealicense.com/licenses/isc/). Copy it, tweak it, and credit.
-
-## License Text
-
-ISC License
-
-Copyright (c) 2017, Sky Welch (license@bunnies.io)
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+For the avoidance of doubt, this code of conduct is [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/) - copy it, change it, and credit me.
diff --git a/code-of-conduct.md b/code-of-conduct.md
@@ -20,7 +20,7 @@ If you feel that another person is violating the rule, or you have other concern
 
 # License
 
-For the avoidance of doubt, this code of conduct is ISC Licensed. Copy it, tweak it, and credit.
+For the avoidance of doubt, this code of conduct is [ISC Licensed](https://choosealicense.com/licenses/isc/). Copy it, tweak it, and credit.
 
 ## License Text
 

diff --git a/code-of-conduct.md b/code-of-conduct.md
@@ -16,4 +16,26 @@ Not being nice could include:
 
 We do not tolerate harassment of people in any form, including but not limited to gender, gender identity and expression, sexual orientation, disability, physical appearance, body size, race, age or religion. Expect action from an op if you break the rule.
 
-If you feel that another person is violating the rule, or you have other concerns, please contact one of the ops via a PM.
+If you feel that another person is violating the rule, or you have other concerns, please contact one of the ops via a PM.
+
+# License
+
+For the avoidance of doubt, this code of conduct is ISC Licensed. Copy it, tweak it, and credit.
+
+## License Text
+
+ISC License
+
+Copyright (c) 2017, Sky Welch (license@bunnies.io)
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/code-of-conduct.md b/code-of-conduct.md
@@ -4,9 +4,9 @@
 
 With that in mind, there is a single rule:
 
-* Don't be a dick
+* Be nice
 
-Being a dick could include:
+Not being nice could include:
 
 * Feigned surprise. When someone says “I don’t know what X is”, you don’t say “You don’t know what X is?!” or “I can’t believe you don’t know what X is!”.
 * Well-actuallys. That is the pedantic corrections that don’t make a difference to the conversation that’s happening.

diff --git a/code-of-conduct.md b/code-of-conduct.md
@@ -12,6 +12,7 @@ Being a dick could include:
 * Well-actuallys. That is the pedantic corrections that don’t make a difference to the conversation that’s happening.
 * Fanboy-ism. Just because Programming Language X has feature Y doesn't mean everyone who doesn't use it is making the biggest mistake of their lives.
 * Trolling. Posting something for the sole purpose of starting an argument or annoying other people is stupid.
+* Excessive conspiracy-theorying. Consider making your own channel if you feel the need to negatively comment on everything related to a (reasonable) subject.
 
 We do not tolerate harassment of people in any form, including but not limited to gender, gender identity and expression, sexual orientation, disability, physical appearance, body size, race, age or religion. Expect action from an op if you break the rule.
 

diff --git a/code-of-conduct.md b/code-of-conduct.md
@@ -1,4 +1,4 @@
-#\#compsoc Code of Conduct
+# #compsoc Code of Conduct
 
 \#compsoc aims at being a nice place to chat about computer related things for anyone involved with Edinburgh University.
 

diff --git a/code-of-conduct.md b/code-of-conduct.md
@@ -11,6 +11,7 @@ Being a dick could include:
 * Feigned surprise. When someone says “I don’t know what X is”, you don’t say “You don’t know what X is?!” or “I can’t believe you don’t know what X is!”.
 * Well-actuallys. That is the pedantic corrections that don’t make a difference to the conversation that’s happening.
 * Fanboy-ism. Just because Programming Language X has feature Y doesn't mean everyone who doesn't use it is making the biggest mistake of their lives.
+* Trolling. Posting something for the sole purpose of starting an argument or annoying other people is stupid.
 
 We do not tolerate harassment of people in any form, including but not limited to gender, gender identity and expression, sexual orientation, disability, physical appearance, body size, race, age or religion. Expect action from an op if you break the rule.
 

diff --git a/code-of-conduct.md b/code-of-conduct.md
@@ -1,6 +1,6 @@
 #\#compsoc Code of Conduct
 
-\#compsoc aims at being a nice place to chat about computer related things for anyone involved in Edinburgh University.
+\#compsoc aims at being a nice place to chat about computer related things for anyone involved with Edinburgh University.
 
 With that in mind, there is a single rule:
 

diff --git a/code-of-conduct.md b/code-of-conduct.md
@@ -1,6 +1,6 @@
 #\#compsoc Code of Conduct
 
-\#compsoc aims at being a nice place to chat about computer related things for undergraduates, teachers and graduates of Edinburgh University.
+\#compsoc aims at being a nice place to chat about computer related things for anyone involved in Edinburgh University.
 
 With that in mind, there is a single rule:
 

diff --git a/code-of-conduct.md b/code-of-conduct.md
@@ -1,6 +1,6 @@
 #\#compsoc Code of Conduct
 
-\#compsoc is a university oriented chat, aimed towards being a nice place to chat about computer related thing for undergraduates, teachers and graduates of Edinburgh University.
+\#compsoc aims at being a nice place to chat about computer related things for undergraduates, teachers and graduates of Edinburgh University.
 
 With that in mind, there is a single rule:
 

diff --git a/code-of-conduct.md b/code-of-conduct.md
@@ -1,6 +1,6 @@
 #\#compsoc Code of Conduct
 
-\#compsoc is a university oriented chat, aimed towards being a nice place to chat for undergraduates, teachers and graduates of Edinburgh University.
+\#compsoc is a university oriented chat, aimed towards being a nice place to chat about computer related thing for undergraduates, teachers and graduates of Edinburgh University.
 
 With that in mind, there is a single rule:
 

diff --git a/code-of-conduct.md b/code-of-conduct.md
@@ -14,4 +14,4 @@ Being a dick could include:
 
 We do not tolerate harassment of people in any form, including but not limited to gender, gender identity and expression, sexual orientation, disability, physical appearance, body size, race, age or religion. Expect action from an op if you break the rule.
 
-If you feel that another person is violating these rules, or you have other concerns, please contact one of the ops via a PM.
+If you feel that another person is violating the rule, or you have other concerns, please contact one of the ops via a PM.
diff --git a/code-of-conduct.md b/code-of-conduct.md
@@ -12,6 +12,6 @@ Being a dick could include:
 * Well-actuallys. That is the pedantic corrections that don’t make a difference to the conversation that’s happening.
 * Fanboy-ism. Just because Programming Language X has feature Y doesn't mean everyone who doesn't use it is making the biggest mistake of their lives.
 
-We do not tolerate harassment of users in any form, including but not limited to gender, gender identity and expression, sexual orientation, disability, physical appearance, body size, race, age or religion.
+We do not tolerate harassment of people in any form, including but not limited to gender, gender identity and expression, sexual orientation, disability, physical appearance, body size, race, age or religion. Expect action from an op if you break the rule.
 
 If you feel that another person is violating these rules, or you have other concerns, please contact one of the ops via a PM.
diff --git a/code-of-conduct.md b/code-of-conduct.md
@@ -1,6 +1,6 @@
 #\#compsoc Code of Conduct
 
-\#compsoc is a university oriented chat, aimed towards being a nice place to chat for undergraduates, teachers and graduates.
+\#compsoc is a university oriented chat, aimed towards being a nice place to chat for undergraduates, teachers and graduates of Edinburgh University.
 
 With that in mind, there is a single rule:
 

diff --git a/code-of-conduct.md b/code-of-conduct.md
@@ -1,4 +1,4 @@
-\#compsoc Code of Conduct
+#\#compsoc Code of Conduct
 
 \#compsoc is a university oriented chat, aimed towards being a nice place to chat for undergraduates, teachers and graduates.
 

diff --git a/code-of-conduct.md b/code-of-conduct.md
@@ -1,6 +1,6 @@
-#compsoc Code of Conduct
+\#compsoc Code of Conduct
 
-#compsoc is a university oriented chat, aimed towards being a nice place to chat for undergraduates, teachers and graduates.
+\#compsoc is a university oriented chat, aimed towards being a nice place to chat for undergraduates, teachers and graduates.
 
 With that in mind, there is a single rule:
 

diff --git a/code-of-conduct.md b/code-of-conduct.md
@@ -1,3 +1,5 @@
+#compsoc Code of Conduct
+
 #compsoc is a university oriented chat, aimed towards being a nice place to chat for undergraduates, teachers and graduates.
 
 With that in mind, there is a single rule:

diff --git a/gistfile1.txt → code-of-conduct.md b/gistfile1.txt → code-of-conduct.md
@@ -1,6 +1,6 @@
-#compsoc is a university oriented chat (aimed towards undergraduates, teachers and graduates).
+#compsoc is a university oriented chat, aimed towards being a nice place to chat for undergraduates, teachers and graduates.
 
-It is intended to provide a harassment-free experience for everyone, whether they fit the target audience or not. With that in mind, there is a single rule:
+With that in mind, there is a single rule:
 
 * Don't be a dick
 

diff --git a/gistfile1.txt b/gistfile1.txt
@@ -0,0 +1,15 @@
+#compsoc is a university oriented chat (aimed towards undergraduates, teachers and graduates).
+
+It is intended to provide a harassment-free experience for everyone, whether they fit the target audience or not. With that in mind, there is a single rule:
+
+* Don't be a dick
+
+Being a dick could include:
+
+* Feigned surprise. When someone says “I don’t know what X is”, you don’t say “You don’t know what X is?!” or “I can’t believe you don’t know what X is!”.
+* Well-actuallys. That is the pedantic corrections that don’t make a difference to the conversation that’s happening.
+* Fanboy-ism. Just because Programming Language X has feature Y doesn't mean everyone who doesn't use it is making the biggest mistake of their lives.
+
+We do not tolerate harassment of users in any form, including but not limited to gender, gender identity and expression, sexual orientation, disability, physical appearance, body size, race, age or religion.
+
+If you feel that another person is violating these rules, or you have other concerns, please contact one of the ops via a PM.