Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Documented our change control process.

  • Loading branch information...
commit e9e0ecd06c07e6ba155d932cc972eee427c8d13b 1 parent 7c3ace7
@jacobian jacobian authored
View
1  django_www/urls.py
@@ -31,6 +31,7 @@
url(r'^conduct/faq/$', TemplateView.as_view(template_name='conduct/faq.html'), name='conduct_faq'),
url(r'^conduct/reporting/$', TemplateView.as_view(template_name='conduct/reporting.html'), name='conduct_reporting'),
url(r'^conduct/enforcement-manual/$', TemplateView.as_view(template_name='conduct/enforcement.html'), name='conduct_enforcement'),
+ url(r'^conduct/changes/$', TemplateView.as_view(template_name='conduct/changes.html'), name='conduct_enforcement'),
url(r'^contact/', include('contact.urls')),
url(r'^r/', include('django.conf.urls.shortcut')),
View
1  templates/conduct/base.html
@@ -8,6 +8,7 @@
<li><a href="/conduct/faq/">Frequently Asked Questions</a></li>
<li><a href="/conduct/reporting/">Reporting Guide</a></li>
<li><a href="/conduct/enforcement-manual/">Enforcement Manual</a></li>
+<li><a href="/conduct/changes/">Changes</a></li>
</ul>
{% endblock %}
View
47 templates/conduct/changes.html
@@ -0,0 +1,47 @@
+{% extends "conduct/base.html" %}
+
+{% block title %}Django Code of Conduct - Changes{% endblock %}
+
+{% block content %}
+<h1>Django Code of Conduct - Changes</h1>
+
+<h2>Change control process</h2>
+
+<p>We're (mostly) programmers, so we'll track changes to the code of conduct and
+associated documents the same way we track changes to code. All changes will
+proposed via a pull request to the
+<a href="http://github.com/django/djangoproject.com">djangoproject.com repository
+on github</a>. Changes will be reviewed by the conduct committee first, and then
+sent to the the DSF, the Django core team, and the Django community for comment.
+We'll hold a comment period of at least one week, and then each group will vote
+on the change using its normal process (a board for the DSF,
+<a href="https://docs.djangoproject.com/en/dev/internals/contributing/bugs-and- features/#how-we-make-decisions">
+a core dev vote</a> for the core team).
+Approved changes will be merged, published, and noted below.</p>
+
+<p>This only applies to material changes; changes that don't change the intent
+(typo fixes, re-wordings, etc.) can be made immediately.</p>
+
+<p>A complete list of changes can always be found
+<a href="https://github.com/django/djangoproject.com/commits/master/templates/conduct">on Github</a>;
+major changes and releases are summarized below.</p>
+
+<h2>Changelog</h2>
+
+<dl>
+
+ <dt>July 31, 2013</dt>
+ <dd>Documents approved and officially published.</dd>
+
+ <dt>July 15, 2013<dt>
+ <dd><a href="https://github.com/django/djangoproject.com/commit/ae21fb5cb1f7edfca5b5556d92fb86186d92aeb3">
+ Added the reporting guide and enforcement manual</a>. Final draft presented
+ to the board and core membership for vote.</dd>
+
+ <dt>April 1, 2013<dt>
+ <dd><a href="https://github.com/django/djangoproject.com/commit/1a0aae11a331bfbf36d6f4091d77413b780454e5">
+ Initial "beta" release and public call for comments</a>.</dd>
+
+</dl>
+
+{% endblock %}
Please sign in to comment.
Something went wrong with that request. Please try again.