Permalink
Browse files

Revised Code of Conduct following DSF board and membership vote.

  • Loading branch information...
freakboy3742 committed Oct 4, 2014
1 parent 75946d5 commit 577a02bbe968de79f8e111d6139f0c1299e994e9
Showing with 16 additions and 7 deletions.
  1. +3 −1 templates/conduct/faq.html
  2. +13 −6 templates/conduct/index.html
@@ -41,7 +41,9 @@ <h3 id="what-does-it-mean">What does it mean to "adopt" a Code of Conduct? <a cl
<p>In practice, this means mailing lists (django-users, django-developers, etc.),
the various Django IRC channels (<tt>#django</tt>, <tt>#django-dev</tt>, etc.), bug
tracking and code review tools, and "official" Django events such as sprints.</p>
tracking and code review tools, and "official" Django events such as sprints.
In addition, violations of this code outside these spaces may affect a person's
ability to participate within them.</p>
<h3 id="dsf-events">What about events funded by the Django Software Foundation? <a class="plink" href="#dsf-events">¶</a></h3>
@@ -17,9 +17,8 @@ <h1>Django Code of Conduct</h1>
<p>Diversity is one of our huge strengths, but it can also lead to communication
issues and unhappiness. To that end, we have a few ground rules that we ask
people to adhere to when they’re participating within this community and
project. These rules apply equally to founders, mentors and those seeking help
and guidance.</p>
people to adhere to. This code applies equally to founders, mentors and those
seeking help and guidance.</p>
<p>This isn’t an exhaustive list of things that you can’t do. Rather, take it in
the spirit in which it’s intended - a guide to make it easier to enrich all of
@@ -28,7 +27,8 @@ <h1>Django Code of Conduct</h1>
<p>This code of conduct applies to all spaces managed by the Django project or
Django Software Foundation. This includes IRC, the mailing lists, the issue
tracker, DSF events, and any other forums created by the project team
which the community uses for communication.</p>
which the community uses for communication. In addition, violations of this code
outside these spaces may affect a person's ability to participate within them.</p>
<p>If you believe someone is violating the code of conduct, we ask that you
report it by emailing
@@ -37,7 +37,14 @@ <h1>Django Code of Conduct</h1>
<a href="/conduct/reporting/">Reporting Guidelines</a></p>
<ul>
<li><strong>Be welcoming, friendly, and patient.</strong></li>
<li><strong>Be friendly and patient.</strong></li>
<li><strong>Be welcoming.</strong> We strive to be a community that welcomes
and supports people of all backgrounds and identities. This includes, but
is not limited to members of any race, ethnicity, culture, national origin,
colour, immigration status, social and economic class, educational level, sex,
sexual orientation, gender identity and expression, age, size, family status,
political belief, religion, and mental and physical ability.</li>
<li><strong>Be considerate.</strong> Your work will be used by other people, and you in turn will
depend on the work of others. Any decision you take will affect users and
@@ -59,7 +66,7 @@ <h1>Django Code of Conduct</h1>
aren't acceptable. This includes, but is not limited to:
<ul>
<li>Violent threats or language directed against another person.</li>
<li>Sexist, racist, or otherwise discriminatory jokes and language.</li>
<li>Discriminatory jokes and language.</li>
<li>Posting sexually explicit or violent material.</li>
<li>Posting (or threatening to post) other people's personally identifying information ("doxing").</li>
<li>Personal insults, especially those using racist or sexist terms.</li>

0 comments on commit 577a02b

Please sign in to comment.