summaryrefslogtreecommitdiff
path: root/docs/internals
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2017-02-14 11:30:33 -0500
committerAymeric Augustin <aymeric.augustin@m4x.org>2017-02-15 09:31:41 +0100
commit3d14cbc86781ea1051af7f0c421bee3ecf2f9842 (patch)
treef6c85b661a3b628ad20c5ef633794227967d5308 /docs/internals
parentb9b35f9efabc19f6c58f2d5962a9e6d8dc53a786 (diff)
Removed docs/internals/roles.txt.
It's moved to https://www.djangoproject.com/foundation/teams/.
Diffstat (limited to 'docs/internals')
-rw-r--r--docs/internals/contributing/committing-code.txt7
-rw-r--r--docs/internals/git.txt3
-rw-r--r--docs/internals/index.txt1
-rw-r--r--docs/internals/organization.txt7
-rw-r--r--docs/internals/roles.txt70
-rw-r--r--docs/internals/security.txt9
6 files changed, 13 insertions, 84 deletions
diff --git a/docs/internals/contributing/committing-code.txt b/docs/internals/contributing/committing-code.txt
index d42fdb8940..fd526b1dd6 100644
--- a/docs/internals/contributing/committing-code.txt
+++ b/docs/internals/contributing/committing-code.txt
@@ -2,10 +2,9 @@
Committing code
===============
-This section is addressed to the :ref:`committers` and to anyone interested in
-knowing how code gets committed into Django core. If you're a community member
-who wants to contribute code to Django, have a look at
-:doc:`writing-code/working-with-git` instead.
+This section is addressed to the committers and to anyone interested in knowing
+how code gets committed into Django. If you're a community member who wants to
+contribute code to Django, look at :doc:`writing-code/working-with-git` instead.
.. _handling-pull-requests:
diff --git a/docs/internals/git.txt b/docs/internals/git.txt
index 0e35544eb4..386a2a05a7 100644
--- a/docs/internals/git.txt
+++ b/docs/internals/git.txt
@@ -242,8 +242,7 @@ branches, used for Google Summer of Code projects.
Tags
====
-Each Django release is tagged and signed by a :ref:`releaser
-<releasers-list>`.
+Each Django release is tagged and signed by the releaser.
The tags can be found on GitHub's `tags`_ page.
diff --git a/docs/internals/index.txt b/docs/internals/index.txt
index e9c32fe304..95183e4db0 100644
--- a/docs/internals/index.txt
+++ b/docs/internals/index.txt
@@ -12,7 +12,6 @@ you'd like to help improve Django or learn about how Django is managed.
mailing-lists
organization
team
- roles
security
release-process
deprecation
diff --git a/docs/internals/organization.txt b/docs/internals/organization.txt
index 5982621757..11000b2ff1 100644
--- a/docs/internals/organization.txt
+++ b/docs/internals/organization.txt
@@ -162,9 +162,8 @@ capacity on non-technical decisions.
Membership
----------
-The technical board is an elected group of five committers. They're expected
-to be experienced but there's no formal seniority requirement. Its current
-composition is published :ref:`here <technical-board-list>`.
+`The technical board`_ is an elected group of five committers. They're expected
+to be experienced but there's no formal seniority requirement.
A new board is elected after each feature release of Django. The election
process is managed by a returns officer nominated by the outgoing technical
@@ -183,6 +182,8 @@ board. The election process works as follows:
Both the application and the voting period last between one and two weeks, at
the outgoing board's discretion.
+.. _the technical board: https://www.djangoproject.com/foundation/teams/#technical-board-team
+
Changing the organization
=========================
diff --git a/docs/internals/roles.txt b/docs/internals/roles.txt
deleted file mode 100644
index aabd11dbb7..0000000000
--- a/docs/internals/roles.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-=====
-Roles
-=====
-
-.. _technical-board-list:
-
-Technical board
-===============
-
-The technical board for the 1.11 release cycle is:
-
-* James Bennett
-* Andrew Godwin
-* Russell Keith-Magee
-* Carl Meyer
-* Marc Tamlyn
-
-.. _committers:
-
-Committers
-==========
-
-Most :ref:`core team <core-team>` members have commit access. They're called
-"committers" or "core developers".
-
-Being part of the core team is a pre-requisite for having commit access.
-
-.. _security-team-list:
-
-Security team
-=============
-
-The security team is responsible for :doc:`Django's security policies
-</internals/security>`. It handles private reports of security issues.
-
-The current security team members are:
-
-- Florian Apolloner
-- James Bennett
-- Tim Graham
-- Adrian Holovaty
-- Markus Holtermann
-- Paul McMillan
-- Carl Meyer
-
-.. _releasers-list:
-
-Releasers
-=========
-
-Releasers take care of :doc:`building Django releases
-</internals/howto-release-django>`.
-
-The current releasers are:
-
-- James Bennett
-- Jacob Kaplan-Moss
-- Tim Graham
-
-Ops team
-========
-
-The ops team maintains Django's infrastructure like the Django Project server,
-Trac instance, and continuous integration infrastructure.
-
-- Florian Apolloner
-- Tim Graham
-- Markus Holtermann
-- Jannis Leidel
-- Tobias McNulty
diff --git a/docs/internals/security.txt b/docs/internals/security.txt
index 148418e0fe..5b4441b7aa 100644
--- a/docs/internals/security.txt
+++ b/docs/internals/security.txt
@@ -23,9 +23,8 @@ publicly reported in this fashion.
Instead, if you believe you've found something in Django which has security
implications, please send a description of the issue via email to
-``security@djangoproject.com``. Mail sent to that address reaches a
-:ref:`subset of the core team <security-team-list>`, who can forward security
-issues into the private team's mailing list for broader discussion if needed.
+``security@djangoproject.com``. Mail sent to that address reaches the `securty
+team <https://www.djangoproject.com/foundation/teams/#security-team>`_.
Once you've submitted an issue via email, you should receive an acknowledgment
from a member of the security team within 48 hours, and depending on the
@@ -106,7 +105,7 @@ triaging our announcement and upgrade Django as needed. Severity levels are:
Second, we notify a list of :ref:`people and organizations
<security-notifications>`, primarily composed of operating-system vendors and
other distributors of Django. This email is signed with the PGP key of someone
-from :ref:`Django's release team <releasers-list>` and consists of:
+from `Django's release team`_ and consists of:
* A full description of the issue and the affected versions of Django.
@@ -150,6 +149,8 @@ theirs.
The Django team also maintains an :doc:`archive of security issues
disclosed in Django</releases/security>`.
+.. _Django's release team: https://www.djangoproject.com/foundation/teams/#releasers-team
+
.. _security-notifications:
Who receives advance notification