Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

The CoC is no longer a draft; edited the documents to reflect that.

  • Loading branch information...
commit 82a953a1966968fd753a75774e0f7a81c29d3fd0 1 parent e9e0ecd
Jacob Kaplan-Moss jacobian authored
2  templates/conduct/base.html
View
@@ -13,7 +13,7 @@
{% endblock %}
-{% block title %}Django Code of Conduct - DRAFT{% endblock %}
+{% block title %}Django Code of Conduct{% endblock %}
{% block extrahead %}
{{ block.super }}
4 templates/conduct/faq.html
View
@@ -12,10 +12,10 @@ <h2 class="deck">
<a href="mailto:conduct@djangoproject.com">contact us</a>.
</h2>
-<h3 id="why-adopt">Why are you adopting a Code of Conduct? <a class="plink" href="#why-adopt">¶</a></h3>
+<h3 id="why-adopt">Why have you adopted a Code of Conduct? <a class="plink" href="#why-adopt">¶</a></h3>
<p>We think the Django community is awesome. If you're familiar with the Django
- community, you'll probably notice that the text above basically matches what
+ community, you'll probably notice that the Code basically matches what
we already do. Think of this as documentation: we're taking implicit
expectations about behavior and making them explicit.</p>
23 templates/conduct/index.html
View
@@ -1,24 +1,15 @@
{% extends "conduct/base.html" %}
-{% block title %}Django Code of Conduct - DRAFT{% endblock %}
+{% block title %}Django Code of Conduct{% endblock %}
{% block content %}
-<h1>Django Code of Conduct - DRAFT</h1>
+<h1>Django Code of Conduct</h1>
{% for message in messages %}
<p class="message">{{ message }}</p>
{% endfor %}
-<h2 class="deck">
-You're looking at a draft Code of Conduct proposed for adoption by the
-Django core team and the Django Software Foundation. Think of this as a
-"beta" release: we've written it, and we like it, but we want community
-feedback before we "check it in" (that is, adopt it formally).
-So please check out the draft text, read the FAQ below, and let us know
-what you think using the feedback form at the bottom of the page.
-</h2>
-
<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
@@ -96,14 +87,4 @@ <h2 class="deck">
that doesn't answer your questions, feel free to
<a href="mailto:conduct@djangoproject.com">contact us</a>.</p>
-<h2>Feedback</h2>
-<p>
-As we said above, this is a rough draft. We want to know what you think before
-we adopt this. Let us know about your questions, comments, concerns, or
-criticism. We'll try to address all the feedback we get via email, or an
-edit to the draft, or both.
-</p>
-
-<div>{% include "contact/coc_form.html" %}</div>
-
{% endblock %}
Please sign in to comment.
Something went wrong with that request. Please try again.