aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--customising/translation.md2
-rw-r--r--getting_started.md25
-rw-r--r--installing/ami.md15
-rw-r--r--installing/manual_install.md12
4 files changed, 26 insertions, 28 deletions
diff --git a/customising/translation.md b/customising/translation.md
index 927067f89..a403f6396 100644
--- a/customising/translation.md
+++ b/customising/translation.md
@@ -28,7 +28,7 @@ need to know about the one that applies to you.
## Translation process: translator's view
-**If you're just working on translating Alavetli into a language you know, then
+**If you're just working on translating Alaveteli into a language you know, then
this section is for you.**
When a developer adds a new feature to the user interface in Alaveteli, they
diff --git a/getting_started.md b/getting_started.md
index 5c3f89c1b..2911aecf3 100644
--- a/getting_started.md
+++ b/getting_started.md
@@ -114,8 +114,7 @@ operating system, though any sort of Linux should do. Rackspace offer suitable
cloud servers, which start out at around $25 / month. Then your tech person
should follow the [installation documentation]({{ site.baseurl }}installing).
-Alternatively, you could use Amazon Web Services. If you've not used them
-before, you can get a free "micro" instance for twelve months. This has the
+Alternatively, you could use Amazon Web Services. This has the
added advantage that you can use our preconfigured [Alaveteli EC2
AMI]({{ site.baseurl }}installing/ami) to get you
started almost instantly. However, it's more expensive than Rackspace,
@@ -181,7 +180,7 @@ http://blogger.com and announce your project with a new blog post.
Next, think about the visual identity. At a minimum, you should probably
replace the default Alaveteli logo that you can see at the top left of
-http://demo.alaveteli.org. It's also easy to change the colour scheme.
+<http://demo.alaveteli.org>. It's also easy to change the colour scheme.
If you have a bit more budget and time, you can rework the design more, with a
custom homepage, different fonts, etc; however, the more you customise the
@@ -218,14 +217,14 @@ therefore relevant only to the UK. You should take these pages as inspiration,
but review their content with a view to your jurisdiction. The important pages
to translate are:
-* [About](https://github.com/mysociety/alaveteli/blob/develop/app/views/help/about.rhtml): why the website exists, why it works, etc
-* [contact](https://github.com/mysociety/alaveteli/blob/develop/app/views/help/contact.rhtml): how to get in touch
-* [credits](https://github.com/mysociety/alaveteli/blob/develop/app/views/help/credits.rhtml): who is involved in the site. Importantly, includes a section on how users can help the project.
-* [officers](https://github.com/mysociety/alaveteli/blob/develop/app/views/help/officers.rhtml): information for the officers who deal with FOI at authorities. They get a link to this page in emails that the site sends them.
-* [privacy](https://github.com/mysociety/alaveteli/blob/develop/app/views/help/privacy.rhtml): privacy policy, plus information making it clear that requests are going to appear on the internet. Let users know if they are allowed to use pseudonyms in your jurisdiction.
-* [requesting](https://github.com/mysociety/alaveteli/blob/develop/app/views/help/requesting.rhtml): the main help page about making requests. How it works, how to decide who to write to, what they can expect in terms of responses, how to make appeals, etc.
-* [unhappy](https://github.com/mysociety/alaveteli/blob/develop/app/views/help/unhappy.rhtml): users are taken to this page after a request that has been somehow unsuccessful (e.g. the request has been refused, or the authority is insisting on a postal request). The page should encourage them to keep going, e.g. by starting a new request or addressing it to a different body.
-* [why email](https://github.com/mysociety/alaveteli/blob/develop/app/views/help/_why_they_should_reply_by_email.rhtml): a snippet of information that explains why users should insist on replies by email. This is displayed next to requests that have "gone postal".
+* [About](https://github.com/mysociety/alaveteli/blob/master/app/views/help/about.rhtml): why the website exists, why it works, etc
+* [contact](https://github.com/mysociety/alaveteli/blob/master/app/views/help/contact.rhtml): how to get in touch
+* [credits](https://github.com/mysociety/alaveteli/blob/master/app/views/help/credits.rhtml): who is involved in the site. Importantly, includes a section on how users can help the project.
+* [officers](https://github.com/mysociety/alaveteli/blob/master/app/views/help/officers.rhtml): information for the officers who deal with FOI at authorities. They get a link to this page in emails that the site sends them.
+* [privacy](https://github.com/mysociety/alaveteli/blob/master/app/views/help/privacy.rhtml): privacy policy, plus information making it clear that requests are going to appear on the internet. Let users know if they are allowed to use pseudonyms in your jurisdiction.
+* [requesting](https://github.com/mysociety/alaveteli/blob/master/app/views/help/requesting.rhtml): the main help page about making requests. How it works, how to decide who to write to, what they can expect in terms of responses, how to make appeals, etc.
+* [unhappy](https://github.com/mysociety/alaveteli/blob/master/app/views/help/unhappy.rhtml): users are taken to this page after a request that has been somehow unsuccessful (e.g. the request has been refused, or the authority is insisting on a postal request). The page should encourage them to keep going, e.g. by starting a new request or addressing it to a different body.
+* [why email](https://github.com/mysociety/alaveteli/blob/master/app/views/help/_why_they_should_reply_by_email.rhtml): a snippet of information that explains why users should insist on replies by email. This is displayed next to requests that have "gone postal".
The help pages contain some HTML. Your tech person should be able to advise on
this.
@@ -288,9 +287,9 @@ called Transifex. This website allows teams of translators to collaborate in
one place, using a fairly easy interface.
The Alaveteli page on Transifex is at
-https://www.transifex.net/projects/p/alaveteli/; the translations all live in a
+<https://www.transifex.com/projects/p/alaveteli/>; the translations all live in a
single translation file called
-[`app.pot`](https://www.transifex.net/projects/p/alaveteli/resource/apppot/).
+[`app.pot`](https://www.transifex.com/projects/p/alaveteli/resource/apppot/).
You can set up your language and provide translations there; you can also use
specialise software on your own computer (see the help pages on Transifex)
diff --git a/installing/ami.md b/installing/ami.md
index 47dd95565..e2c113eba 100644
--- a/installing/ami.md
+++ b/installing/ami.md
@@ -19,16 +19,15 @@ server on an Amazon EC2 instance. This creates an instance that runs in
development mode, so we wouldn't recommend you use it for a production system
without changing the configuration.
-If you haven't used Amazon Web Services before, then you can get a Micro
-instance which will be [free for a year](http://aws.amazon.com/free/). You will
-find that a micro instance isn't powerful enough for anything other very basic
-testing of Alaveteli, however.
+Unfortunately, Alaveteli will not run properly on a free Micro
+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-0f24c678
-and name “Basic Alaveteli installation 2013-10-31”. You can launch an instance
+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
based on that AMI with [this
-link](https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-0f2
-4c678).
+link](https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-8603f4f1).
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
diff --git a/installing/manual_install.md b/installing/manual_install.md
index 100908be5..01e868551 100644
--- a/installing/manual_install.md
+++ b/installing/manual_install.md
@@ -7,12 +7,12 @@ title: Manual installation
# Manual Installation
<p class="lead">
- The following instructions describe the step-by-step process for
- installing Alavetli. <em>You don't necessarily need to do it this
- way:</em> it's usually easier to use the
- <a href="{{ site.baseurl }}installing/script">installation script</a>
- or the
- <a href="{{ site.baseurl }}installing/ami">Amazon EC2 AMI</a>.
+ The following instructions describe the step-by-step process for
+ installing Alaveteli. <em>You don't necessarily need to do it this
+ way:</em> it's usually easier to use the
+ <a href="{{ site.baseurl }}installing/script">installation script</a>
+ or the
+ <a href="{{ site.baseurl }}installing/ami">Amazon EC2 AMI</a>.
</p>
Note that there are [other ways to install Alaveteli]({{ site.baseurl }}installing).