diff options
| author | James Bennett <james@b-list.org> | 2012-08-07 16:06:34 -0400 |
|---|---|---|
| committer | James Bennett <james@b-list.org> | 2012-08-07 16:06:34 -0400 |
| commit | 1ef1bceb3b79f73686e1857e5cdb051b8c11bc09 (patch) | |
| tree | e9b8c259e08e2a1f70cf6835e86949886c8b7126 /docs/internals/release-process.txt | |
| parent | 46cc530fad3c6ae4009557121971fe749742aef6 (diff) | |
Add new security-policy documentation.
This formally describes our policies on reporting, notification and
disclosure of security issues, and provides a detailed explanation of
our full security-response process, for reference purposes.
Diffstat (limited to 'docs/internals/release-process.txt')
| -rw-r--r-- | docs/internals/release-process.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/docs/internals/release-process.txt b/docs/internals/release-process.txt index 97adb4a3f6..8affddb5e0 100644 --- a/docs/internals/release-process.txt +++ b/docs/internals/release-process.txt @@ -31,10 +31,14 @@ Since version 1.0, Django's release numbering works as follows: These are of the form ``A.B alpha/beta/rc N``, which means the ``Nth`` alpha/beta/release candidate of version ``A.B``. -In Subversion, each Django release will be tagged under ``tags/releases``. If -it's necessary to release a bug fix release or a security release that doesn't -come from the trunk, we'll copy that tag to ``branches/releases`` to make the -bug fix release. +In git, each Django release will have a tag indicating its version +number, signed with the Django release key. Additionally, each release +series (X.Y) has its own branch, and bugfix/security releases will be +issued from those branches. + +For more information about how the Django project issues new releases +for security purposes, please see :doc:`our security policies +<security>`. Major releases -------------- |