4 files changed, 23 insertions, 18 deletions
diff --git a/docs/installing/ami.md b/docs/installing/ami.md
index 1f7195761..e63e70023 100644
--- a/docs/installing/ami.md
+++ b/docs/installing/ami.md
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: Installing the easy way
+title: Installation from AMI
 ---
 
 # Installation on Amazon EC2
diff --git a/docs/installing/deploy.md b/docs/installing/deploy.md
index e51adda31..c71c987bb 100644
--- a/docs/installing/deploy.md
+++ b/docs/installing/deploy.md
@@ -8,7 +8,8 @@ title: Deploying
 <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,
-  especially on your <a href="{{ site.baseurl }}docs/glossary/#production">production server</a>.
+  especially on your
+  <a href="{{ site.baseurl }}docs/glossary/#production" class="glossary__link">production server</a>.
   Alaveteli provides a deployment mechanism using Capistrano.
 </p>
 
@@ -27,13 +28,13 @@ changes or copying files by hand, so your site will be down for the shortest
 possible time.
 
 We **strongly recommend** you use the deployment mechanism for your
-<a href="{{ site.baseurl }}docs/glossary/#production">production server</a> and, if
-you're running one, your
-<a href="{{ site.baseurl }}docs/glossary/#staging">staging server</a> too.
+<a href="{{ site.baseurl }}docs/glossary/#production" class="glossary__link">production server</a>
+and, if you're running one, your
+<a href="{{ site.baseurl }}docs/glossary/#staging" class="glossary__link">staging server</a> too.
 
 ## Capistrano
 
-<a href="{{site.baseurl}}docs/glossary/#capistrano" class="glossary">Capistrano</a>
+<a href="{{site.baseurl}}docs/glossary/#capistrano" class="glossary__link">Capistrano</a>
 is included as part of Alaveteli as a standard deployment system.
 
 The basic principle of Capistrano is that you execute `cap [do-something]`
@@ -94,7 +95,7 @@ Next, on your local machine:
 Back on the server:
 
 * copy the following config files from the temporary copy of Alaveteli you made at
-  the begining (perhaps in your home directory) to the `shared` directory that
+  the beginning (perhaps in your home directory) to the `shared` directory that
   Capistrano just created on the server:
    * `general.yml`
    * `database.yml`
@@ -110,14 +111,15 @@ Back on the server:
    * `cache/`
    * `files/`
    * `lib/acts_as_xapian/xapiandbs` (copy this to straight into `shared` so it becomes `shared/xapiandbs`)
+   * `log/`
 
 Now, back on your local machine:
 
 * make sure you're still in the Alaveteli repo (if not, `cd` back into it)
 * run `cap -S stage=staging  deploy:update_code` to get a code checkout on the server.
 * create a deployment directory on the server by running *one* of these commands:
-   * `cap deploy` if you're deploying a <a href="{{site.baseurl}}docs/glossary/#staging" class="glossary">staging site</a>, or...
-   * `cap -S stage=production deploy` for <a href="{{site.baseurl}}docs/glossary/#production" class="glossary">production</a>
+   * `cap deploy` if you're deploying a <a href="{{site.baseurl}}docs/glossary/#staging" class="glossary__link">staging site</a>, or...
+   * `cap -S stage=production deploy` for <a href="{{site.baseurl}}docs/glossary/#production" class="glossary__link">production</a>
 * update the webserver config (either apache or nginx) to add the `current` element
   to the path where it is serving Alaveteli from. If you installed using the
   installation script, this will be replacing `/var/www/alaveteli/alaveteli/` with
diff --git a/docs/installing/index.md b/docs/installing/index.md
index c276c3d08..50bcfd25a 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
diff --git a/docs/installing/script.md b/docs/installing/script.md
index b8b678a0a..0d826ac8a 100644
--- a/docs/installing/script.md
+++ b/docs/installing/script.md
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: Installing the easy way
+title: Installation script
 ---
 
 # Installation  script