diff options
| author | Jacob Kaplan-Moss <jacob@jacobian.org> | 2015-04-17 09:13:48 -0700 |
|---|---|---|
| committer | Jacob Kaplan-Moss <jacob@jacobian.org> | 2015-04-17 09:13:48 -0700 |
| commit | fbf64d3eb6c1db45aa9eda45272ada40e409252d (patch) | |
| tree | 6b527b3c95fef3deedf04d00f047a090432dd258 | |
| parent | b98dfc21770bb0ddc57ca34ddecf1576c2d9f176 (diff) | |
| download | django-link-to-code-of-conduct.tar.gz | |
Add link to the code of conduct from contributing guides.link-to-code-of-conduct
This is inspired by Angluar.js
(https://github.com/angular/angular/blob/master/CONTRIBUTING.md), among others.
Thanks to Jeff Triplett for the prod.
| -rw-r--r-- | CONTRIBUTING.rst | 6 | ||||
| -rw-r--r-- | docs/intro/contributing.txt | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 4a5887b117..7a8701f664 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -24,3 +24,9 @@ Django uses Trac to keep track of bugs, feature requests, and associated patches because GitHub doesn't provide adequate tooling for its community. Patches can be submitted as pull requests, but if you don't file a ticket, it's unlikely that we'll notice your contribution. + +Code of conduct +=============== + +As a contributor, you can help us keep the Django community open and inclusive. +Please read and follow our `Code of Conduct <https://www.djangoproject.com/conduct/>`_. diff --git a/docs/intro/contributing.txt b/docs/intro/contributing.txt index d1bd798864..74b4220cbc 100644 --- a/docs/intro/contributing.txt +++ b/docs/intro/contributing.txt @@ -68,6 +68,12 @@ It contains lots of great information and is a must read for anyone who'd like to become a regular contributor to Django. If you've got questions, it's probably got the answers. +Conduct +======= + +As a contributor, you can help us keep the Django community open and inclusive. +Please read and follow our `Code of Conduct <https://www.djangoproject.com/conduct/>`_. + Installing Git ============== |