From 7ea3c5cce272311ce76b7bc438377f90959635a7 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Wed, 9 Jul 2014 16:09:25 +0100 Subject: add missing glossary_link to glossary links found using git grep -P ']+glossary[^>]+' | grep -v __link in case that's handy. --- docs/installing/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/installing/index.md') diff --git a/docs/installing/index.md b/docs/installing/index.md index c276c3d08..f722ff512 100644 --- a/docs/installing/index.md +++ b/docs/installing/index.md @@ -9,7 +9,7 @@ title: Installing Although you can install Alaveteli and just change it when you need it, we recommend you adopt a way of deploying it automatically. This has several advantages, especially for your - production server. + production server.

## Before you start -- cgit v1.2.3 From 2f2852afe9fec3b05a165cec36395f6788507b2b Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Wed, 9 Jul 2014 18:04:53 +0100 Subject: fix installation (overview) lead para Whoops, this at some point became the deployment page's lead para. --- docs/installing/index.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'docs/installing/index.md') diff --git a/docs/installing/index.md b/docs/installing/index.md index f722ff512..ff132861c 100644 --- a/docs/installing/index.md +++ b/docs/installing/index.md @@ -6,10 +6,12 @@ title: Installing # Installing Alaveteli

- Although you can install Alaveteli and just change it when you need it, we - recommend you adopt a way of deploying it automatically. - This has several advantages, especially for your - production server. + 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.

## Before you start -- cgit v1.2.3 From 8ab79db54687bcc503a27fb3f25aa6b05a7580d7 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Wed, 9 Jul 2014 18:11:33 +0100 Subject: fix glossary links on installation index page --- docs/installing/index.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'docs/installing/index.md') diff --git a/docs/installing/index.md b/docs/installing/index.md index ff132861c..50bcfd25a 100644 --- a/docs/installing/index.md +++ b/docs/installing/index.md @@ -17,8 +17,8 @@ title: Installing ## 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). +development or +production. 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 @@ -32,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 +staging site, 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 -- cgit v1.2.3 From 691902f1b6a99dbea63d1ceba09868e8efe24fe3 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Mon, 14 Jul 2014 17:22:50 +0100 Subject: Clarify that MTA install is done by the install script and on EC2. --- docs/installing/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/installing/index.md') diff --git a/docs/installing/index.md b/docs/installing/index.md index 50bcfd25a..41d1a5602 100644 --- a/docs/installing/index.md +++ b/docs/installing/index.md @@ -59,7 +59,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/) -- cgit v1.2.3 From 054679a24edf296024c7279ec3ef17ec39eda9aa Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Wed, 30 Jul 2014 09:35:37 +0100 Subject: Add documentation on installing with Vagrant. --- docs/installing/index.md | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/installing/index.md') diff --git a/docs/installing/index.md b/docs/installing/index.md index 41d1a5602..c04aaa3ca 100644 --- a/docs/installing/index.md +++ b/docs/installing/index.md @@ -50,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 -- cgit v1.2.3