Browse files

Use Oxford commas.

My High School English teacher would be proud.
  • Loading branch information...
1 parent 8ed4ee8 commit ec6949e878f3f518cd8270c2cb0e3be9454ecc2b @jacobian jacobian committed Apr 1, 2013
Showing with 3 additions and 3 deletions.
  1. +3 −3 templates/code_of_conduct.html
6 templates/code_of_conduct.html
@@ -35,7 +35,7 @@ <h2 class="deck">
<p>Like the technical community as a whole, the Django team and community is made up
of a mixture of professionals and volunteers from all over the world, working on
-every aspect of the mission - including mentorship, teaching and connecting
+every aspect of the mission - including mentorship, teaching, and connecting
<p>Diversity is one of our huge strengths, but it can also lead to communication
@@ -120,7 +120,7 @@ <h3 id="what-does-it-mean">What does it mean to "adopt" a Code of Conduct? <a hr
when in "official" Django spaces. We're proposing that this code — or rather,
the final draft of it — be adopted simultaneously by the Django core team and by
the Django Software Foundation. So that means that it'll apply both in community
- spaces *and* at DSF events.</p>
+ spaces <em>and</em> at DSF events.</p>
<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
@@ -136,7 +136,7 @@ <h3 id="dsf-events">What about events funded by the Django Software Foundation?
<p>No: there's a difference between the two, and they're complementary.</p>
<p>This Code of Conduct is all about how we interact as a community. It's about
- saying that the Django community will be open, friendly and welcoming.
+ saying that the Django community will be open, friendly, and welcoming.
The core issue is about ensuring the conversations we have are productive
and inviting for all.</p>

0 comments on commit ec6949e

Please sign in to comment.