aboutsummaryrefslogtreecommitdiffstats
path: root/docs/developers/index.md
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2015-05-29 14:19:39 +0100
committerLouise Crow <louise.crow@gmail.com>2015-05-29 14:19:39 +0100
commit07f61fe9c11db6ea87d14a80ab868b4510d6718e (patch)
tree5a96212d0c619b25c55185d03b1ee2dfe70007b3 /docs/developers/index.md
parent2a352830329319380742b99cb16840b632b29ae2 (diff)
Update references to rails-3-develop branch to develop branch.
Also reflect the fact that it is the default branch in a couple of github links.
Diffstat (limited to 'docs/developers/index.md')
-rw-r--r--docs/developers/index.md10
1 files changed, 4 insertions, 6 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.