From a1abb38e735cd5b491d678bf4eff97d7ba4fdadb Mon Sep 17 00:00:00 2001 From: Christopher Pecoraro Date: Thu, 21 Jan 2016 10:08:28 +0100 Subject: [PATCH 1/2] Add religious evangelism-based activity --- code-of-conduct.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code-of-conduct.md b/code-of-conduct.md index f6558ee..9cb9723 100644 --- a/code-of-conduct.md +++ b/code-of-conduct.md @@ -40,7 +40,9 @@ to gender, sexual orientation, race, religion, disability; inappropriate use of nudity and/or sexual images in public spaces (including presentation slides); deliberate intimidation, stalking or following; harassing photography or recording; sustained disruption of talks or other events; inappropriate physical -contact; and unwelcome sexual attention. +contact; and unwelcome sexual attention. In addition, religious evangelism and +discussion of related topics, as well as relate distribution of religious +literature of any nature is unwelcome. Our expectation is that we will treat each other, and others our community interacts with, with consideration, empathy, and respect. Our speech and behavior From fce30befcf36aaf6052e908434bb298993a96f14 Mon Sep 17 00:00:00 2001 From: Christopher Pecoraro Date: Thu, 21 Jan 2016 10:10:42 +0100 Subject: [PATCH 2/2] Add religious evangelism-based activity --- code-of-conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code-of-conduct.md b/code-of-conduct.md index 9cb9723..09ffc1d 100644 --- a/code-of-conduct.md +++ b/code-of-conduct.md @@ -41,7 +41,7 @@ nudity and/or sexual images in public spaces (including presentation slides); deliberate intimidation, stalking or following; harassing photography or recording; sustained disruption of talks or other events; inappropriate physical contact; and unwelcome sexual attention. In addition, religious evangelism and -discussion of related topics, as well as relate distribution of religious +discussion of related topics, as well as related distribution of religious literature of any nature is unwelcome. Our expectation is that we will treat each other, and others our community