aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Whiteland <dave@mysociety.org>2014-06-17 17:32:43 +0200
committerDave Whiteland <dave@mysociety.org>2014-06-17 17:32:43 +0200
commit54575d777d6ec8d9892b78cf8611b003b82d932e (patch)
treec6d01f72454b3cf6201a4bbd84b0e5d27ea23c3e
parent0ca1a6446b8ccd6345227a4ac5c1a31bf90a558b (diff)
parent7beb025d74e83da6d4237d062efc12736ced391e (diff)
Merge remote-tracking branch 'origin/gh-pages-upgrading' into gh-pages-upgrading
Conflicts: docs/running/upgrading.md
-rw-r--r--docs/running/upgrading.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/running/upgrading.md b/docs/running/upgrading.md
index 4074e7a14..611712bf6 100644
--- a/docs/running/upgrading.md
+++ b/docs/running/upgrading.md
@@ -15,8 +15,8 @@ Upgrading Alaveteli
The developer team policy is that the `master` branch in git should always
contain the latest stable release -- so you'll be up to date if you pull from
-the `master` branch. However, on your <a
-href="{{site.baseurl}}docs/glossary/#production" class="glossary">production site</a>,
+the `master` branch. However, on your
+<a href="{{site.baseurl}}docs/glossary/#production" class="glossary">production site</a>,
you should know precisely what version you're running, and deploy Alaveteli
from a [*specific* release tag](https://github.com/mysociety/alaveteli/releases).