Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Use Oxford commas.

My High School English teacher would be proud.
  • Loading branch information...
commit ec6949e878f3f518cd8270c2cb0e3be9454ecc2b 1 parent 8ed4ee8
Jacob Kaplan-Moss authored April 01, 2013

Showing 1 changed file with 3 additions and 3 deletions. Show diff stats Hide diff stats

  1. 6  templates/code_of_conduct.html
6  templates/code_of_conduct.html
@@ -35,7 +35,7 @@ <h2 class="deck">
35 35
 
36 36
 <p>Like the technical community as a whole, the Django team and community is made up
37 37
 of a mixture of professionals and volunteers from all over the world, working on
38  
-every aspect of the mission - including mentorship, teaching and connecting
  38
+every aspect of the mission - including mentorship, teaching, and connecting
39 39
 people.</p>
40 40
 
41 41
 <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
120 120
     when in "official" Django spaces. We're proposing that this code — or rather,
121 121
     the final draft of it — be adopted simultaneously by the Django core team and by
122 122
     the Django Software Foundation. So that means that it'll apply both in community
123  
-    spaces *and* at DSF events.</p>
  123
+    spaces <em>and</em> at DSF events.</p>
124 124
 
125 125
     <p>In practice, this means mailing lists (django-users, django-developers, etc.),
126 126
     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?
136 136
     <p>No: there's a difference between the two, and they're complementary.</p>
137 137
 
138 138
     <p>This Code of Conduct is all about how we interact as a community. It's about
139  
-    saying that the Django community will be open, friendly and welcoming.
  139
+    saying that the Django community will be open, friendly, and welcoming.
140 140
     The core issue is about ensuring the conversations we have are productive
141 141
     and inviting for all.</p>
142 142
 

0 notes on commit ec6949e

Please sign in to comment.
Something went wrong with that request. Please try again.