aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/developers/index.md10
-rw-r--r--docs/installing/manual_install.md4
-rw-r--r--docs/running/security.md2
-rw-r--r--docs/running/upgrading.md2
4 files changed, 8 insertions, 10 deletions
diff --git a/docs/developers/index.md b/docs/developers/index.md
index bcf74be16..fcfb144a8 100644
--- a/docs/developers/index.md
+++ b/docs/developers/index.md
@@ -27,13 +27,11 @@ title: For developers
), which include notes about our use of `gettext`.
* We use the [git flow branching
- model](http://nvie.com/posts/a-successful-git-branching-model/), with a small
- change: currently our `develop` branch is called `rails-3-develop`, which
- means that the latest development version is always found on the
- [rails-3-develop
- branch](https://github.com/mysociety/alaveteli/tree/rails-3-develop). The
+ model](http://nvie.com/posts/a-successful-git-branching-model/),
+ the latest development version is always found on the
+ [develop branch](https://github.com/mysociety/alaveteli). The
latest stable version is always on the [master
- branch](https://github.com/mysociety/alaveteli). If you plan to collaborate
+ branch](https://github.com/mysociety/alaveteli/tree/master). If you plan to collaborate
on the software, you may find the [git flow
extensions](https://github.com/nvie/gitflow) useful.
diff --git a/docs/installing/manual_install.md b/docs/installing/manual_install.md
index d4e2a6d17..0146762ca 100644
--- a/docs/installing/manual_install.md
+++ b/docs/installing/manual_install.md
@@ -241,10 +241,10 @@ Create the target directory and clone the Alaveteli source code in to this direc
--branch master \
https://github.com/mysociety/alaveteli.git /var/www/alaveteli
-This clones the master branch which always contains the latest stable release. If you want to try out the latest (possibly buggy) code you can switch to the `rails-3-develop` branch.
+This clones the master branch which always contains the latest stable release. If you want to try out the latest (possibly buggy) code you can switch to the `develop` branch.
pushd /var/www/alaveteli
- sudo -u alaveteli git checkout rails-3-develop
+ sudo -u alaveteli git checkout develop
sudo -u alaveteli git submodule update
popd
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/).