Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge pull request #1358 from loic/docs

Rephrased the docs for reporting security issues to make it less intimidating.
  • Loading branch information...
commit ce5c8a392f2f0e08d2d100c369ae28a3e86f4efc 2 parents 862a04a + aff0aa3
Tim Graham authored July 16, 2013

Showing 1 changed file with 7 additions and 5 deletions. Show diff stats Hide diff stats

  1. 12  docs/internals/security.txt
12  docs/internals/security.txt
@@ -19,7 +19,7 @@ security@djangoproject.com**.
19 19
 
20 20
 Most normal bugs in Django are reported to `our public Trac
21 21
 instance`_, but due to the sensitive nature of security issues, we ask
22  
-that they *not* be publicly reported in this fashion.
  22
+that they **not** be publicly reported in this fashion.
23 23
 
24 24
 Instead, if you believe you've found something in Django which has
25 25
 security implications, please send a description of the issue via
@@ -28,15 +28,17 @@ reaches a subset of the core development team, who can forward
28 28
 security issues into the private committers' mailing list for broader
29 29
 discussion if needed.
30 30
 
31  
-You can send encrypted email to this address; the public key ID for
32  
-``security@djangoproject.com`` is ``0xfcb84b8d1d17f80b``, and this
33  
-public key is available from most commonly-used keyservers.
34  
-
35 31
 Once you've submitted an issue via email, you should receive an
36 32
 acknowledgment from a member of the Django development team within 48
37 33
 hours, and depending on the action to be taken, you may receive
38 34
 further followup emails.
39 35
 
  36
+.. note::
  37
+
  38
+    If you want to send an encrypted email (*optional*), the public key ID for
  39
+    ``security@djangoproject.com`` is ``0xfcb84b8d1d17f80b``, and this public
  40
+    key is available from most commonly-used keyservers.
  41
+
40 42
 .. _our public Trac instance: https://code.djangoproject.com/query
41 43
 
42 44
 .. _security-support:

0 notes on commit ce5c8a3

Please sign in to comment.
Something went wrong with that request. Please try again.