summaryrefslogtreecommitdiff
path: root/docs/internals
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2011-04-17 14:27:53 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2011-04-17 14:27:53 +0000
commit9b21a0c92132f5b5c9c8ca33fba88c1eab2f2933 (patch)
tree9ebd95d5f14aa31e43783b24f0880770864d77d0 /docs/internals
parentcdd75e078ab548a3690113b3bdaeda47decba92a (diff)
[1.3.X] Updated the contributing document to accurately reflect our security process.
Backport of [16032] from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.3.X@16033 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/internals')
-rw-r--r--docs/internals/contributing.txt14
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/internals/contributing.txt b/docs/internals/contributing.txt
index 6e14083dbe..33ee50a7b4 100644
--- a/docs/internals/contributing.txt
+++ b/docs/internals/contributing.txt
@@ -104,19 +104,19 @@ following actions:
fix is forthcoming. We'll give a rough timeline and ask the reporter
to keep the issue confidential until we announce it.
- * Halt all other development as long as is needed to develop a fix,
- including patches against the current and two previous releases.
+ * Focus on developing a fix as quickly as possible and produce patches
+ against the current and two previous releases.
* Determine a go-public date for announcing the vulnerability and the fix.
To try to mitigate a possible "arms race" between those applying the
patch and those trying to exploit the hole, we will not announce
security problems immediately.
- * Pre-notify everyone we know to be running the affected version(s) of
- Django. We will send these notifications through private e-mail
- which will include documentation of the vulnerability, links to the
- relevant patch(es), and a request to keep the vulnerability
- confidential until the official go-public date.
+ * Pre-notify third-party distributors of Django ("vendors"). We will send
+ these vendor notifications through private email which will include
+ documentation of the vulnerability, links to the relevant patch(es), and a
+ request to keep the vulnerability confidential until the official
+ go-public date.
* Publicly announce the vulnerability and the fix on the pre-determined
go-public date. This will probably mean a new release of Django, but