Merge branch 'gh-pages' of ssh://git.mysociety.org/data/git/public/alaveteli into gh-pages

1 files changed, 14 insertions, 10 deletions

diff --git a/docs/installing/index.md b/docs/installing/index.md
index c276c3d08..c04aaa3ca 100644
--- a/docs/installing/index.md
+++ b/docs/installing/index.md
@@ -6,17 +6,19 @@ title: Installing
 # Installing Alaveteli
 
 <p class="lead">
-  Although you can install Alaveteli and just change it when you need it, we
-  recommend you adopt a way of <strong>deploying</strong> it automatically.
-  This has several advantages, especially for your
-  <a href="{{ site.baseurl }}docs/glossary/#production">production server</a>.
+  There are a number of ways to install Alaveteli.
+  We've made an Amazon Machine Image (AMI) so you can quickly deploy on
+  Amazon EC2 (handy if you just want to evaluate it, for example).
+  If you prefer to use your own server, there's an installation script
+  which does most of the work for you, or you can follow the manual
+  installation instructions.
 </p>
 
 ## Before you start
 
 This is important: you need to decide if you are installing Alaveteli for
-[development]({{ site.baseurl }}docs/glossary/#development) or
-[production]({{ site.baseurl }}docs/glossary/#production).
+<a href="{{ site.baseurl }}docs/glossary/#development" class="glossary__link">development</a> or
+<a href="{{ site.baseurl }}docs/glossary/#production" class="glossary__link">production</a>.
 
 A **development** site is one where you're going to change, customise, and
 perhaps experiment while you get it up and running. You should always do this
@@ -30,9 +32,10 @@ messages switched off. It's important to be able to deploy changes to a
 production site quickly and efficiently, so we recommend you consider using a
 [deployment mechanism]({{ site.baseurl }}docs/installing/deploy/) too.
 
-Ideally, you should also have a [staging site]({{ site.baseurl }}docs/glossary/#staging),
+Ideally, you should also have a
+<a href="{{ site.baseurl }}docs/glossary/#staging" class="glossary__link">staging site</a>,
 which is used solely to test new code in an identical environment to your
-production site but before it goes live.
+production site before it goes live.
 
 If you're in doubt, you're probably running a development site. Get it up and
 running, play with it, customise it, and -- later -- you can install it as a
@@ -47,6 +50,7 @@ those servers, because Capistrano takes care of that for you.
 
 ## Installing the core code
 
+* [Install into a Vagrant virtual development environment]({{ site.baseurl }}docs/installing/vagrant/) -- a good choice for development, and playing around with the site.
 * [Install on Amazon EC2]({{ site.baseurl }}docs/installing/ami/) using our AMI
 * [Use the installation script]({{ site.baseurl }}docs/installing/script/) which does the full installation on your own server
 * [Manual installation]({{ site.baseurl }}docs/installing/manual_install/) -- step-by-step instructions
@@ -56,7 +60,7 @@ If you're setting up a development server on MacOS X, we've also got
 
 ## Other installation information
 
-Alaveteli needs to be able to send and receive email, so you need to setup your
-MTA (Mail Transfer Agent) appropriately.
+Alaveteli needs to be able to send and receive email. If you're installing manually, you need to [setup your
+MTA (Mail Transfer Agent) appropriately]({{ site.baseurl }}docs/installing/email/). The other install methods will do this for you.
 
 * [Installing the MTA]({{ site.baseurl }}docs/installing/email/)