From 13fab33898e6a52fbdb0900eea3a722dcedd7527 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 17 Jun 2014 16:04:14 +0100 Subject: Add trailing slashes to internal URLs. --- docs/installing/ami.md | 2 +- docs/installing/index.md | 10 +++++----- docs/installing/macos.md | 2 +- docs/installing/manual_install.md | 10 +++++----- docs/installing/script.md | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'docs/installing') diff --git a/docs/installing/ami.md b/docs/installing/ami.md index 42f2907cb..3f8897b16 100644 --- a/docs/installing/ami.md +++ b/docs/installing/ami.md @@ -9,7 +9,7 @@ title: Installing the easy way We've made an Amazon Machine Image (AMI) so you can quickly deploy on Amazon EC2. This is handy if you just want to evaluate Alaveteli, for example.

-Note that there are [other ways to install Alaveteli]({{ site.baseurl }}docs/installing). +Note that there are [other ways to install Alaveteli]({{ site.baseurl }}docs/installing/). ## Installing from our AMI diff --git a/docs/installing/index.md b/docs/installing/index.md index 98efa7b8a..c276c3d08 100644 --- a/docs/installing/index.md +++ b/docs/installing/index.md @@ -47,16 +47,16 @@ those servers, because Capistrano takes care of that for you. ## Installing the core code -* [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 +* [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 If you're setting up a development server on MacOS X, we've also got -[MacOS installation instructions]({{ site.baseurl }}docs/installing/macos). +[MacOS installation instructions]({{ site.baseurl }}docs/installing/macos/). ## Other installation information Alaveteli needs to be able to send and receive email, so you need to setup your MTA (Mail Transfer Agent) appropriately. -* [Installing the MTA]({{ site.baseurl }}docs/installing/email) +* [Installing the MTA]({{ site.baseurl }}docs/installing/email/) diff --git a/docs/installing/macos.md b/docs/installing/macos.md index 181057fda..2b6309b89 100644 --- a/docs/installing/macos.md +++ b/docs/installing/macos.md @@ -11,7 +11,7 @@ title: Installing on MacOS X help.

-Note that there are [other ways to install Alaveteli]({{ site.baseurl }}docs/installing). +Note that there are [other ways to install Alaveteli]({{ site.baseurl }}docs/installing/). ## MacOS X 10.7 diff --git a/docs/installing/manual_install.md b/docs/installing/manual_install.md index 0c6efb1d9..777d95139 100644 --- a/docs/installing/manual_install.md +++ b/docs/installing/manual_install.md @@ -10,18 +10,18 @@ title: Manual installation The following instructions describe the step-by-step process for installing Alaveteli. You don't necessarily need to do it this way: it's usually easier to use the - installation script + installation script or the - Amazon EC2 AMI. + Amazon EC2 AMI.

-Note that there are [other ways to install Alaveteli]({{ site.baseurl }}docs/installing). +Note that there are [other ways to install Alaveteli]({{ site.baseurl }}docs/installing/). ## Target operating system These instructions assume Debian Squeeze (64-bit) or Ubuntu 12.04 LTS (precise). Debian Squeeze is the best supported deployment platform. We also -have instructions for [installing on MacOS]({{ site.baseurl }}docs/installing/macos). +have instructions for [installing on MacOS]({{ site.baseurl }}docs/installing/macos/). Commands are intended to be run via the terminal or over ssh. @@ -206,7 +206,7 @@ to the test config in `database.yml` (as seen in `database.yml-example`) You will need to set up an email server (MTA) to send and receive emails. Full configuration for an MTA is beyond the scope of this document -- see this -[example config for Exim4]({{ site.baseurl }}docs/installing/email). +[example config for Exim4]({{ site.baseurl }}docs/installing/email/). Note that in development mode mail is handled by mailcatcher by default so that you can see the mails in a browser - see [http://mailcatcher.me/](http://mailcatcher.me/) for more diff --git a/docs/installing/script.md b/docs/installing/script.md index 173243dcb..b8b678a0a 100644 --- a/docs/installing/script.md +++ b/docs/installing/script.md @@ -9,7 +9,7 @@ title: Installing the easy way If you prefer to use your own server, we've provided an installation script which does most of the work for you.

-Note that there are [other ways to install Alaveteli]({{ site.baseurl }}docs/installing). +Note that there are [other ways to install Alaveteli]({{ site.baseurl }}docs/installing/). ## Installing with the installation script -- cgit v1.2.3 From 3aae2cc7f7166765de7bb003b332ed45157d4e8a Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 17 Jun 2014 16:44:39 +0100 Subject: https URLs for github --- docs/installing/deploy.md | 2 +- docs/installing/macos.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/installing') diff --git a/docs/installing/deploy.md b/docs/installing/deploy.md index 5378b89d6..4bbc91a9d 100644 --- a/docs/installing/deploy.md +++ b/docs/installing/deploy.md @@ -78,7 +78,7 @@ Next, on your local machine: * Capistrano requires Ruby 1.9 or more, and can be installed using rubygems * do: `gem install capistrano` * install Bundler if you don't have it already -- do: `gem install bundler` -* checkout the [Alaveteli repo](http://github.com/mysociety/alaveteli/) (you +* checkout the [Alaveteli repo](https://github.com/mysociety/alaveteli/) (you need some of the files available locally even though you might not be running Alaveteli on this machine) * copy the example file `config/deploy.yml.example` to `config/deploy.yml` diff --git a/docs/installing/macos.md b/docs/installing/macos.md index 2b6309b89..c46bdf4ba 100644 --- a/docs/installing/macos.md +++ b/docs/installing/macos.md @@ -25,7 +25,7 @@ If you are using OS X Lion, download *Command Line Tools for Xcode* from [Apple] **Note:** As of Xcode 4.2, a non-LLVM version of GCC is no longer included. Homebrew has dealt with it by [switching to Clang](https://github.com/mxcl/homebrew/issues/6852). However, you may encounter errors installing RVM. *Please report these on the [mailing list](https://groups.google.com/group/alaveteli-dev).* The following instructions have been tested with Xcode 4.1. If necessary, you can install GCC from Xcode 4.1 by running: - brew install http://github.com/adamv/homebrew-alt/raw/master/duplicates/apple-gcc42.rb + brew install https://github.com/adamv/homebrew-alt/raw/master/duplicates/apple-gcc42.rb ## Homebrew -- cgit v1.2.3 From 3d64a802326b5a8a193df95e7af3705214605a9f Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Thu, 19 Jun 2014 17:04:39 +0100 Subject: Update AMI reference. --- docs/installing/ami.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/installing') diff --git a/docs/installing/ami.md b/docs/installing/ami.md index 3f8897b16..1f7195761 100644 --- a/docs/installing/ami.md +++ b/docs/installing/ami.md @@ -24,10 +24,10 @@ instance due to the low amount of memory available on those instances; you will need to use at least a Small instance, which Amazon will charge for. -The AMI can be found in the EU West (Ireland) region, with the ID ami-8603f4f1 -and name “Basic Alaveteli installation 2014-01-29”. You can launch an instance +The AMI can be found in the EU West (Ireland) region, with the ID ami-23519f54 +and name “Basic Alaveteli installation 2014-06-12”. You can launch an instance based on that AMI with [this -link](https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-8603f4f1). +link](https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-23519f54). When you create an EC2 instance based on that AMI, make sure that you choose Security Groups that allows at least inbound HTTP, HTTPS, SSH and, if you want -- cgit v1.2.3