diff options
| author | Gareth Rees <gareth@mysociety.org> | 2014-10-16 11:58:42 +0100 |
|---|---|---|
| committer | Gareth Rees <gareth@mysociety.org> | 2014-10-16 11:58:42 +0100 |
| commit | 6feb5c459d17418a1ff6a6841ba826f71823f1f6 (patch) | |
| tree | 2bcb9ad51bce26d1116c2a417d03fdd2401dd3ce | |
| parent | 4f4139974173e25b1462f337f94a55fcd3169efd (diff) | |
| parent | a97afcd38bbec3a675db532e11bebf324feb218e (diff) | |
Merge branch 'security' into gh-pages
| -rw-r--r-- | _layouts/page.html | 1 | ||||
| -rw-r--r-- | docs/running/security.md | 36 |
2 files changed, 37 insertions, 0 deletions
diff --git a/_layouts/page.html b/_layouts/page.html index 8cee7ba11..0fc63db64 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -66,6 +66,7 @@ layout: default <li><a href="{{ site.baseurl }}docs/running/">Running</a> <ul> <li><a href="{{ site.baseurl }}docs/running/admin_manual/">Admin manual</a></li> + <li><a href="{{ site.baseurl }}docs/running/security/">Security & Maintenance</a></li> <li><a href="{{ site.baseurl }}docs/running/server/">Server checklist</a></li> <li><a href="{{ site.baseurl }}docs/running/upgrading/">Upgrading</a></li> </ul> diff --git a/docs/running/security.md b/docs/running/security.md new file mode 100644 index 000000000..a22c4d636 --- /dev/null +++ b/docs/running/security.md @@ -0,0 +1,36 @@ +--- +layout: page +title: Security & Maintenance +--- + +# Security & Maintenance + +<p class="lead"> + Support of Alaveteli is divided into four groups: New features, bug fixes, security issues, and severe security issues. They are handled as follows: +</p> + +## New Features + +Only the [latest development branch](https://github.com/mysociety/alaveteli/tree/rails-3-develop/) gets new features which will be released in the next main release. + +## Bug Fixes + +- Only the current release will receive bug fixes +- Bug fixes will get a new release (e.g. `0.19.0` gets a new release to `0.19.1`) +- Bug fixes will be applied to current development branch + +## Security Issues + +- The current release, previous release and current development branch will receive fixes +- Security issues will get a new release (e.g. `0.19.0` gets a new release to `0.19.1`) for the current and previous releases +- Generic patch will be posted to the mailing list + +## Severe Security Issues + +- Severe is determined by the Alaveteli core team +- The current release, previous release and current development branch will receive fixes +- Severe security issues will get a new release (e.g. `0.19.0` gets a new release to `0.19.1`) for supported versions +- Generic patch will be posted to the mailing list +- All releases known to be in production will receive patches and every effort will be made to contact known re-users for a private disclosure + + |