diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-05-29 15:25:26 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-05-29 15:25:26 +0100 |
| commit | 22de9397d00d85a5e4d857cb8c7ffd4f19ca4f89 (patch) | |
| tree | 5a96212d0c619b25c55185d03b1ee2dfe70007b3 /docs/running | |
| parent | 2a352830329319380742b99cb16840b632b29ae2 (diff) | |
| parent | 07f61fe9c11db6ea87d14a80ab868b4510d6718e (diff) | |
Merge branch 'gh-pages-develop' into gh-pages
Diffstat (limited to 'docs/running')
| -rw-r--r-- | docs/running/security.md | 2 | ||||
| -rw-r--r-- | docs/running/upgrading.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/running/security.md b/docs/running/security.md index a22c4d636..f051a0053 100644 --- a/docs/running/security.md +++ b/docs/running/security.md @@ -11,7 +11,7 @@ title: Security & Maintenance ## 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. +Only the [latest development branch](https://github.com/mysociety/alaveteli/tree/develop/) gets new features which will be released in the next main release. ## Bug Fixes diff --git a/docs/running/upgrading.md b/docs/running/upgrading.md index 39c18163c..4a3bdbdca 100644 --- a/docs/running/upgrading.md +++ b/docs/running/upgrading.md @@ -105,7 +105,7 @@ Deprecation notices allow us to communicate with you that some functionality wil ### What to do if you see a deprecation notice -You will usually see a deprecation notice if you have been using functionality in your theme that is now due to change or be removed. The notice should give you a fair explanation of what to do about it. Usually it will be changing or removing methods. The [changelog](https://github.com/mysociety/alaveteli/blob/rails-3-develop/doc/CHANGES.md) will include more detailed information about the deprecation and how to make the necessary changes. +You will usually see a deprecation notice if you have been using functionality in your theme that is now due to change or be removed. The notice should give you a fair explanation of what to do about it. Usually it will be changing or removing methods. The [changelog](https://github.com/mysociety/alaveteli/blob/develop/doc/CHANGES.md) will include more detailed information about the deprecation and how to make the necessary changes. If you're ever unsure, don't hesitate to ask in the [developer mailing list](https://groups.google.com/group/alaveteli-dev) or [Alaveteli IRC channel](http://www.irc.mysociety.org/). |