aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CNAME2
-rw-r--r--_config.yml2
-rw-r--r--_layouts/default.html6
-rw-r--r--_layouts/page.html36
-rw-r--r--_posts/2011-07-04-asktheeu-and-informata-zyrtare-at-okcon201.markdown2
-rw-r--r--_posts/2011-07-29-you-need-volunteers-to-make-your-website-work.markdown2
-rw-r--r--_posts/2012-04-16-a-right-to-know-site-for-spain.markdown5
-rw-r--r--_posts/2012-04-16-alavetelicon-community-cakes-and-black-boxes.markdown2
-rw-r--r--_posts/2012-05-15-8-steps-to-understanding-and-implementing-alaveteli.markdown4
-rw-r--r--_posts/2012-06-20-the-new-bootstrap-admin-theme.markdown2
-rw-r--r--_posts/2012-06-21-new-feature-following-and-the-wall.markdown2
-rw-r--r--about.md3
-rw-r--r--alaveteli-doc-master.txt18
-rw-r--r--community/conferences/2012.md4
-rw-r--r--community/conferences/index.md2
-rw-r--r--community/index.md3
-rw-r--r--deployments.md56
-rw-r--r--docs/customising/config.md10
-rw-r--r--docs/customising/index.md10
-rw-r--r--docs/customising/themes.md10
-rw-r--r--docs/customising/translation.md3
-rw-r--r--docs/developers/directory_structure.md6
-rw-r--r--docs/developers/index.md13
-rw-r--r--docs/developers/overview.md2
-rw-r--r--docs/getting_started.md14
-rw-r--r--docs/glossary.md28
-rw-r--r--docs/index.md14
-rw-r--r--docs/installing/ami.md8
-rw-r--r--docs/installing/deploy.md2
-rw-r--r--docs/installing/index.md10
-rw-r--r--docs/installing/macos.md4
-rw-r--r--docs/installing/manual_install.md10
-rw-r--r--docs/installing/script.md2
-rw-r--r--docs/running/admin_manual.md4
-rw-r--r--docs/running/index.md6
-rw-r--r--docs/running/server.md11
-rw-r--r--docs/running/states.md6
-rw-r--r--docs/running/states_informatazyrtare.md4
-rw-r--r--google14caf34192e45d35.html1
-rw-r--r--google77287ac10bb8023f.html1
-rw-r--r--index.md6
41 files changed, 165 insertions, 171 deletions
diff --git a/CNAME b/CNAME
index 66baea461..a4c675bc8 100644
--- a/CNAME
+++ b/CNAME
@@ -1,2 +1,2 @@
-code.alaveteli.org
+alaveteli.org
diff --git a/_config.yml b/_config.yml
index 479f3901f..37eefa1f8 100644
--- a/_config.yml
+++ b/_config.yml
@@ -4,3 +4,5 @@ baseurl: /
permalink: pretty
markdown: kramdown
url: http://code.alaveteli.org
+gems:
+ - jekyll-redirect-from
diff --git a/_layouts/default.html b/_layouts/default.html
index 19f533d58..8b65d334f 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -23,24 +23,24 @@
ga('send', 'pageview');
(function() {
- var cx = '012469947838795749698:abakbfgsmqm';
+ var cx = '017774751021845757815:coockvcxkjm';
var gcse = document.createElement('script');
gcse.type = 'text/javascript';
gcse.async = true;
gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
-
'//www.google.com/cse/cse.js?cx=' + cx;
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(gcse, s);
})();
+
</script>
</head>
<body>
<div class="ms-header">
<nav class="ms-header__row">
- <a class="ms-header__logo" href="http://www.mysociety.org">mySociety</a>
+ <a class="ms-header__logo" href="https://www.mysociety.org">mySociety</a>
</nav>
</div>
diff --git a/_layouts/page.html b/_layouts/page.html
index 23be68e6e..f4186f02d 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -19,7 +19,7 @@ layout: default
{% capture url_parts %}{{ url_parts | remove_first:part }}{% endcapture %}
{% endfor %}
{% else %}
- <li><a href="/blog">Blog</a></li>
+ <li><a href="/blog/">Blog</a></li>
{% endif %}
{% endif %}
</ul>
@@ -39,39 +39,39 @@ layout: default
<li><a href="{{ site.baseurl }}about/">About</a></li>
<li><a href="{{ site.baseurl }}docs/">Documentation</a>
<ul>
- <li><a href="{{ site.baseurl }}docs/glossary">Glossary</a></li>
+ <li><a href="{{ site.baseurl }}docs/glossary/">Glossary</a></li>
</uL>
</li>
- <li><a href="{{ site.baseurl }}docs/getting_started">Getting Started</a></li>
+ <li><a href="{{ site.baseurl }}docs/getting_started/">Getting Started</a></li>
<li><a href="{{ site.baseurl }}docs/installing/">Installing</a>
<ul>
- <li><a href="{{ site.baseurl }}docs/installing/script">Install script</a></li>
- <li><a href="{{ site.baseurl }}docs/installing/ami">Alaveteli AMI for EC2</a></li>
- <li><a href="{{ site.baseurl }}docs/installing/manual_install">Installing by hand</a></li>
- <li><a href="{{ site.baseurl }}docs/installing/deploy">Deploying</a></li>
- <li><a href="{{ site.baseurl }}docs/installing/email">MTA (email)</a></li>
+ <li><a href="{{ site.baseurl }}docs/installing/script/">Install script</a></li>
+ <li><a href="{{ site.baseurl }}docs/installing/ami/">Alaveteli AMI for EC2</a></li>
+ <li><a href="{{ site.baseurl }}docs/installing/manual_install/">Manual Install</a></li>
+ <li><a href="{{ site.baseurl }}docs/installing/deploy/">Deploying</a></li>
+ <li><a href="{{ site.baseurl }}docs/installing/email/">MTA (email)</a></li>
</ul>
</li>
<li><a href="{{ site.baseurl }}docs/customising/">Customising</a>
<ul>
- <li><a href="{{ site.baseurl }}docs/customising/config">Configuration</a></li>
- <li><a href="{{ site.baseurl }}docs/customising/themes">Themes</a></li>
- <li><a href="{{ site.baseurl }}docs/customising/translation">Translation</a></li>
+ <li><a href="{{ site.baseurl }}docs/customising/config/">Configuration</a></li>
+ <li><a href="{{ site.baseurl }}docs/customising/themes/">Themes</a></li>
+ <li><a href="{{ site.baseurl }}docs/customising/translation/">Translation</a></li>
</ul>
</li>
<li><a href="{{ site.baseurl }}docs/running/">Running</a>
<ul>
- <li><a href="{{ site.baseurl }}docs/running/admin_manual">Admin manual</a></li>
- <li><a href="{{ site.baseurl }}docs/running/server">Server checklist</a></li>
- <li><a href="{{ site.baseurl }}docs/running/upgrading">Upgrading</a></li>
- <li><a href="{{ site.baseurl }}docs/running/states">Request states</a></li>
+ <li><a href="{{ site.baseurl }}docs/running/admin_manual/">Admin manual</a></li>
+ <li><a href="{{ site.baseurl }}docs/running/server/">Server checklist</a></li>
+ <li><a href="{{ site.baseurl }}docs/running/upgrading/">Upgrading</a></li>
+ <li><a href="{{ site.baseurl }}docs/running/states/">Request states</a></li>
</ul>
</li>
<li><a href="{{ site.baseurl }}docs/developers/">For developers</a>
<ul>
- <li><a href="{{ site.baseurl }}docs/developers/overview">High-level overview</a></li>
- <li><a href="{{ site.baseurl }}docs/developers/directory_structure">Directory structure</a></li>
- <li><a href="{{ site.baseurl }}docs/developers/api">API</a></li>
+ <li><a href="{{ site.baseurl }}docs/developers/overview/">High-level overview</a></li>
+ <li><a href="{{ site.baseurl }}docs/developers/directory_structure/">Directory structure</a></li>
+ <li><a href="{{ site.baseurl }}docs/developers/api/">API</a></li>
</ul>
</li>
<li><a href="{{ site.baseurl }}community/">Community</a>
diff --git a/_posts/2011-07-04-asktheeu-and-informata-zyrtare-at-okcon201.markdown b/_posts/2011-07-04-asktheeu-and-informata-zyrtare-at-okcon201.markdown
index e50ac93b6..88c0d5375 100644
--- a/_posts/2011-07-04-asktheeu-and-informata-zyrtare-at-okcon201.markdown
+++ b/_posts/2011-07-04-asktheeu-and-informata-zyrtare-at-okcon201.markdown
@@ -18,7 +18,7 @@ tags:
- whatdotheyknow
---
-Last week I travelled to Berlin to meet with [@dcabo](http://twitter.com/#!/dcabo), [@helen_access](http://twitter.com/#!/helen_access) and [@KerstiRu](http://twitter.com/#!/KerstiRu) of [Access Info Europe](http://www.access-info.org/) and Valon Brestovci of [Free Libre Open Source Software Kosova](http://www.flossk.org/) (FLOSSK) to discuss and plan collaboration on the first Alaveteli-driven websites: _AskTheEu_ and _Informata Zyrtare_.
+Last week I travelled to Berlin to meet with [@dcabo](https://twitter.com/#!/dcabo), [@helen_access](https://twitter.com/#!/helen_access) and [@KerstiRu](https://twitter.com/#!/KerstiRu) of [Access Info Europe](http://www.access-info.org/) and Valon Brestovci of [Free Libre Open Source Software Kosova](http://www.flossk.org/) (FLOSSK) to discuss and plan collaboration on the first Alaveteli-driven websites: _AskTheEu_ and _Informata Zyrtare_.
{% include image.html url="/assets/img/foamthing.jpg" description="Open hardware milling machine at OKCon" width="223" %}
diff --git a/_posts/2011-07-29-you-need-volunteers-to-make-your-website-work.markdown b/_posts/2011-07-29-you-need-volunteers-to-make-your-website-work.markdown
index 0646e26d1..be98b6c39 100644
--- a/_posts/2011-07-29-you-need-volunteers-to-make-your-website-work.markdown
+++ b/_posts/2011-07-29-you-need-volunteers-to-make-your-website-work.markdown
@@ -27,7 +27,7 @@ A successful Alaveteli website is nothing without its volunteers.  These are pe
[WhatDoTheyKnow](http://www.whatdotheyknow.com) has an amazing volunteer pool of around six or seven people, of whom about three are active at any one time (it varies depending on their other commitments).  They are dedicated, committed, knowledgeable and enthusiastic, and the website quite simply wouldn't function without them.
-So, how did WhatDoTheyKnow recruit this team of experts?  I spoke with the original author of WhatDoTheyKnow, [Francis Irving](http://twitter.com/#!/frabcus), to find out.
+So, how did WhatDoTheyKnow recruit this team of experts?  I spoke with the original author of WhatDoTheyKnow, [Francis Irving](https://twitter.com/#!/frabcus), to find out.
>At mySociety, we had a pool of people on our mailing lists who had been waiting for years for something to get involved in.  We found a way early on of letting people contribute really easily, and this became a route to finding volunteers who were really good:
diff --git a/_posts/2012-04-16-a-right-to-know-site-for-spain.markdown b/_posts/2012-04-16-a-right-to-know-site-for-spain.markdown
index e58043aac..1c9146b4e 100644
--- a/_posts/2012-04-16-a-right-to-know-site-for-spain.markdown
+++ b/_posts/2012-04-16-a-right-to-know-site-for-spain.markdown
@@ -8,14 +8,11 @@ title: A Right-to-Know site for Spain
wordpress_id: 339
---
-## ![](http://diy.mysociety.org/wp-content/uploads/2012/04/tuderechoasaber.jpg)
-
-
[Tuderechoasaber.es](http://www.tuderechoasaber.es/) is Spain’s brand new Right-to-Know site, built on Alaveteli. The project is managed by David Cabo and Victoria Anderica, and it launches against a fascinating political background.
When the project was started, Spain was one of four EU countries with no Freedom of Information law. The subject was, however, on the political agenda – FOI had been promised, but not delivered, by the previous government in both 2004 and 2008. On election in December 2011, the new conservative ruling party again pledged to introduce Freedom of Information, within their first 100 days in office.
-Anderica works at the organisation [Access Info Europe](http://www.access-info.org/), which had been campaigning, with the support of NGOs including Amnesty International and Greenpeace, for a Freedom of Information law. Cabo is one of the founders of [Civio](http://www.civio.es/), a new organisation hoping to emulate the work of [mySociety](http://www.mysociety.org/) or the [Sunlight Foundation](http://sunlightfoundation.com/), in Spain. The combination of Access Info and Civio’s knowledge – legal and technical – meant that Tuderechoasaber.es could become a reality.
+Anderica works at the organisation [Access Info Europe](http://www.access-info.org/), which had been campaigning, with the support of NGOs including Amnesty International and Greenpeace, for a Freedom of Information law. Cabo is one of the founders of [Civio](http://www.civio.es/), a new organisation hoping to emulate the work of [mySociety](https://www.mysociety.org/) or the [Sunlight Foundation](http://sunlightfoundation.com/), in Spain. The combination of Access Info and Civio’s knowledge – legal and technical – meant that Tuderechoasaber.es could become a reality.
There was such public thirst for these withheld rights that Cabo and Anderica were able to fund their website through crowdsourced donations. They raised €6,000 and the site was built.
diff --git a/_posts/2012-04-16-alavetelicon-community-cakes-and-black-boxes.markdown b/_posts/2012-04-16-alavetelicon-community-cakes-and-black-boxes.markdown
index 6009722fb..aec6fcf77 100644
--- a/_posts/2012-04-16-alavetelicon-community-cakes-and-black-boxes.markdown
+++ b/_posts/2012-04-16-alavetelicon-community-cakes-and-black-boxes.markdown
@@ -50,7 +50,7 @@ I'm not sure what conclusion to take from this, exactly. It remains the case tha
Lots of people at the conference asked for more statistics to be made available on Alaveteli sites. mySociety has always been a little reluctant to release statistics, because they are so easy to spin or misinterpret. However, delegates repeatedly referred to their power for campaigning. The psychological impact of a big red cross next to your organisation's name, which you can remedy through positive action, is a powerful motivator. One idea that was mooted was to award a real-life prize (a.k.a. [Cake and Fireworks](https://github.com/mysociety/alaveteli/issues/438)) to the "top" authorities in various categories each year. I think this is a great idea.
**3. Black Box APIs**
-[Acesso Inteligente](www.­accesointeligent­e.­org) is an FOI website in Chile that doesn't use Alaveteli. In Chile, all FOI requests must be made via various different web forms. Accesso Inteligente is a tremendous technical achievement which automatically posts requests to the correct organisation's form, and "screen scrapes" the results, giving Chilean citizens a uniform interface to make all FOI requests.
+[Acesso Inteligente](https://www.accesointeligente.org/AccesoInteligente/#home) is an FOI website in Chile that doesn't use Alaveteli. In Chile, all FOI requests must be made via various different web forms. Accesso Inteligente is a tremendous technical achievement which automatically posts requests to the correct organisation's form, and "screen scrapes" the results, giving Chilean citizens a uniform interface to make all FOI requests.
The team behind the website would love to use Alaveteli as their front end system. The concept they've come up with is deceptively simple: repackage their form-posting-and-scraping functionality as a "black box" which acts as if it's an authority that accepts FOI requests by emails, and sends the answers by email. They can then install Alaveteli without any modifications, and configure it to send FOI requests to the relevant "black box" email addresses.
diff --git a/_posts/2012-05-15-8-steps-to-understanding-and-implementing-alaveteli.markdown b/_posts/2012-05-15-8-steps-to-understanding-and-implementing-alaveteli.markdown
index cfa8c15b9..60fcb4ca5 100644
--- a/_posts/2012-05-15-8-steps-to-understanding-and-implementing-alaveteli.markdown
+++ b/_posts/2012-05-15-8-steps-to-understanding-and-implementing-alaveteli.markdown
@@ -67,11 +67,11 @@ Here, in eight points, is the key to understanding why Alaveteli has excited adv
* The Alaveteli code has been translated into 8 languages.
-[Dolores Lavalle Cobo](http://twitter.com/dololavalle), a lawyer and specialist in access to public information, says Alaveteli revolutionises the concept of what it means to share information, and creates a change of mentality in the people.
+[Dolores Lavalle Cobo](https://twitter.com/dololavalle), a lawyer and specialist in access to public information, says Alaveteli revolutionises the concept of what it means to share information, and creates a change of mentality in the people.
She’s not exaggerating. This software is a testament to how technology, enthusiasm and a commitment to transparency can create a tool without limits for citizen participation.
-Meanwhile, public policy consultant [Germain Stalker](http://twitter.com/stalkerGer) agrees with this definition: "Alaveteli universalises access to information, allowing the public documents held by the State to acquire real and tangible value."
+Meanwhile, public policy consultant [Germain Stalker](https://twitter.com/stalkerGer) agrees with this definition: "Alaveteli universalises access to information, allowing the public documents held by the State to acquire real and tangible value."
Nothing is more certain than this. Demanding transparency is a task for the people, and the platform has awakened interest in what governments do, as never before.
diff --git a/_posts/2012-06-20-the-new-bootstrap-admin-theme.markdown b/_posts/2012-06-20-the-new-bootstrap-admin-theme.markdown
index 0feac3e78..00343fb66 100644
--- a/_posts/2012-06-20-the-new-bootstrap-admin-theme.markdown
+++ b/_posts/2012-06-20-the-new-bootstrap-admin-theme.markdown
@@ -14,7 +14,7 @@ One of the major new features in the latest release of Alaveteli is a more attra
{% include image.html url="/assets/img/oldnew.png" description="Admin interface before and after" width="643" %}
-The theme was started at AlaveteliCon by [@wombleton](https://twitter.com/#!/wombleton).  It's based on Twitter's [Bootstrap framework](http://twitter.github.com/bootstrap/), a CSS-and-javascript foundation for layout and styling of websites.  It tries to collapse the large amounts of data often found on a single page into smaller chunks that can be scanned more easily.
+The theme was started at AlaveteliCon by [@wombleton](https://twitter.com/#!/wombleton).  It's based on Twitter's [Bootstrap framework](https://twitter.github.com/bootstrap/), a CSS-and-javascript foundation for layout and styling of websites.  It tries to collapse the large amounts of data often found on a single page into smaller chunks that can be scanned more easily.
When I started integrating the new code into the Alaveteli core, I realised that this might be quite a big and potentially unwanted step for users who are used to the old interface.  So I moved all the interface changes [into their own theme](https://github.com/mysociety/adminbootstraptheme), which can be installed or uninstalled by changing [a line in the configuration file](https://github.com/mysociety/alaveteli/blob/2e69a53ff5c3e15dd5a7a0fcb5f8fcedf3d6f778/config/general.yml-example#L37).
diff --git a/_posts/2012-06-21-new-feature-following-and-the-wall.markdown b/_posts/2012-06-21-new-feature-following-and-the-wall.markdown
index df6bb6ef5..a776a4648 100644
--- a/_posts/2012-06-21-new-feature-following-and-the-wall.markdown
+++ b/_posts/2012-06-21-new-feature-following-and-the-wall.markdown
@@ -8,7 +8,7 @@ title: 'New feature: "following" and the "wall"'
wordpress_id: 369
---
-You've always been able to subscribe to email alerts about requests.  However, since WhatDoTheyKnow (the predecessor to Alaveteli) was first conceived, [certain](http://www.facebook.com) [well-known](http://twitter.com) websites have become the primary way many of us interact with the internet.  So we decided to use some of their technology.  Instead of subscribing to alerts, you now follow topics.  And when you follow a topic, by default this still means you get email; but you can turn email alerts off, and choose to view updates on a new "wall" area.
+You've always been able to subscribe to email alerts about requests.  However, since WhatDoTheyKnow (the predecessor to Alaveteli) was first conceived, [certain](http://www.facebook.com) [well-known](https://twitter.com) websites have become the primary way many of us interact with the internet.  So we decided to use some of their technology.  Instead of subscribing to alerts, you now follow topics.  And when you follow a topic, by default this still means you get email; but you can turn email alerts off, and choose to view updates on a new "wall" area.
Here's the _"Follow"_ button:
diff --git a/about.md b/about.md
index 15537a03e..d859cae31 100644
--- a/about.md
+++ b/about.md
@@ -1,4 +1,5 @@
---
+redirect_from: /about-2/
layout: landing
title: About
---
@@ -25,7 +26,7 @@ title: About
<div class="about__column">
<p>Groups who want to set up an Alaveteli website should note that its success depends on more than just deploying the software: it requires constant maintenance to ensure requests are successfully dealt with (whether from technical, usability or legal points of view). The project will therefore also develop a set of best practices for the human side of a successful FOI website. To start with, we have <a href="{{ site.baseurl }}2011/07/29/you-need-volunteers-to-make-your-website-work/">a blog post describing the importance of volunteers</a>.
</p>
- <p>The software started life as <a href="https://www.whatdotheyknow.com">WhatDoTheyKnow</a>, a website produced by <a href="https://mysociety.org/">mySociety</a> for making FOI requests in the UK. Its history and background are described <a href="https://www.whatdotheyknow.com/help/credits">over there</a>. The development of Alaveteli is currently managed by <a href="http://twitter.com/crowbot">Louise Crow of mySociety</a>.</p>
+ <p>The software started life as <a href="https://www.whatdotheyknow.com">WhatDoTheyKnow</a>, a website produced by <a href="https://mysociety.org/">mySociety</a> for making FOI requests in the UK. Its history and background are described <a href="https://www.whatdotheyknow.com/help/credits">over there</a>. The development of Alaveteli is currently managed by <a href="https://twitter.com/crowbot">Louise Crow of mySociety</a>.</p>
</div>
</div>
</div>
diff --git a/alaveteli-doc-master.txt b/alaveteli-doc-master.txt
index f22983e45..875cb25f3 100644
--- a/alaveteli-doc-master.txt
+++ b/alaveteli-doc-master.txt
@@ -32,15 +32,15 @@ These pages (in the wiki) have work/attention still pending:
These pages are form the repo's doc/ directory
----------------------------------------------
-[ ] [ ] CHANGES.md
-[ ] [ ] DEPLOY.md
-[ ] [ ] INSTALL-exim4.md
-[ ] [ ] INSTALL-postfix.md
-[ ] [ ] INSTALL.md
-[ ] [ ] THEME-ASSETS-UPGRADE.md
-[ ] [ ] THEMES-UPGRADE.md
-[ ] [ ] THEMES.md
-[ ] [ ] TRANSLATE.md
+[no] [ok] CHANGES.md
+[ok] [no] DEPLOY.md
+[ok] [no] INSTALL-exim4.md
+[ok] [no] INSTALL-postfix.md
+[ok] [no] INSTALL.md
+[no] [ok] THEME-ASSETS-UPGRADE.md
+[no] [ok] THEMES-UPGRADE.md
+[no] [ok] THEMES.md
+[no] [ok] TRANSLATE.md
diff --git a/community/conferences/2012.md b/community/conferences/2012.md
index dbbc39e8e..21e16086a 100644
--- a/community/conferences/2012.md
+++ b/community/conferences/2012.md
@@ -179,13 +179,13 @@ Heather has won numerous awards including the Judges’ Prize at the 2010 Britis
Richard has been a volunteer administrator of mySociety's Freedom of Information website WhatDoTheyKnow.com since 2009. In this role he, along with other members of the team, responds to the continuous deluge of mail from users, public bodies and others. He is involved with dealing with requests to take material down from the site, maintaining the list of public bodies, and providing advice to users of the service as well as discussing and developing the site's policies.
-Richard and other team members tweet (<a href="http://twitter.com/WhatDoTheyKnow">@WhatDoTheyKnow</a>) and write articles about the site and lobby for improvements to the UK's Freedom of Information law.
+Richard and other team members tweet (<a href="https://twitter.com/WhatDoTheyKnow">@WhatDoTheyKnow</a>) and write articles about the site and lobby for improvements to the UK's Freedom of Information law.
Beyond WhatDoTheyKnow.com too Richard is an activist promoting openness, transparency and representative democracy in the UK, particularly in the field of policing, crime and justice.
<ul>
<li>Web: <a href="http://www.rtaylor.co.uk">RTaylor.co.uk</a></li>
-<li>Twitter: <a href="http://twitter.com/RTaylorUK">@RTaylorUK</a></li>
+<li>Twitter: <a href="https://twitter.com/RTaylorUK">@RTaylorUK</a></li>
<li>WhatDoTheyKnow: <a href="https://www.whatdotheyknow.com/user/richard_taylor">FOI requests</a></li>
</ul>
</div>
diff --git a/community/conferences/index.md b/community/conferences/index.md
index 08967b0d9..d6f84ca60 100644
--- a/community/conferences/index.md
+++ b/community/conferences/index.md
@@ -4,4 +4,4 @@ title: Conferences
---
Conferences
====================
-The first Alaveteli Conference, [AlaveteliCon 2012]({{ site.baseurl }}community/conferences/2012), was a great success, and we hope to hold another soon. Watch this space!
+The first Alaveteli Conference, [AlaveteliCon 2012]({{ site.baseurl }}community/conferences/2012/), was a great success, and we hope to hold another soon. Watch this space!
diff --git a/community/index.md b/community/index.md
index d335a82d7..f0497bb07 100644
--- a/community/index.md
+++ b/community/index.md
@@ -1,4 +1,5 @@
---
+redirect_from: /contact/
layout: page
title: Community
---
@@ -64,5 +65,5 @@ Although asking a human is great, often what you want to know can be
found in the documentation:
* [this documentation]({{ site.baseurl }}docs/) &mdash; always the first place to look
-* [the dev wiki](http://github.com/mysociety/alaveteli/wiki) &mdash; informal or specific notes
+* [the dev wiki](https://github.com/mysociety/alaveteli/wiki) &mdash; informal or specific notes
* [docs in the repo](https://github.com/mysociety/alaveteli/tree/rails-3-develop/doc) (although we're slowly phasing these out in favour of the docs you're reading now)
diff --git a/deployments.md b/deployments.md
index 2ef5c4a2f..5e79e61ee 100644
--- a/deployments.md
+++ b/deployments.md
@@ -4,7 +4,7 @@ title: Deployments
---
<div class="deployments__intro">
<div class="container">
- <h1>16+ languages, 16 jurisdictions
+ <h1>20+ languages, 18 jurisdictions
<span>200,000 requests for information</span></h1>
<p>Alaveteli can help open up government in any country,
in any language, and within any legislation</p>
@@ -16,31 +16,43 @@ in any language, and within any legislation</p>
<h2>Deployments of Alaveteli</h2>
<div class="deployments__list--featured">
<div class="grid-row">
- <div class="deployments__unit--major">
+ <div class="deployments__unit--major">
<div class="deployment--major">
- <img src="{{ site.baseurl }}assets/img/ki-mit-tud.jpg" class="deployment__screenshot" />
- <h3 class="deployment__title">Ki Mit Tud</h3>
- <p class="deployment__country">Hungary</p>
- <p class="deployment__link"><a href="http://kimittud.atlatszo.hu/">http://kimittud.atlatszo.hu/</a></p>
+ <img src="{{ site.baseurl }}assets/img/what-do-they-know.jpg" class="deployment__screenshot" />
+ <h3 class="deployment__title">WhatDoTheyKnow</h3>
+ <p class="deployment__country">United Kingdom</p>
+ <p class="deployment__link"><a href="https://www.whatdotheyknow.com/">https://www.whatdotheyknow.com/</a></p>
<div class="deployment__description">
- <p>Hungarians have a right, enshrined in their law, to demand information from any tax-funded body. Ki Mit Tud (“Who Knows What?”) radically simplifies that process for the citizen.</p>
- <p>Using the Alaveteli platform, Ki Mit Tud was launched in May 2012, and within its first year had processed over 1,000 freedom of information requests.</p>
+ <p>Alaveteli started life as <a href="https://www.whatdotheyknow.com">WhatDoTheyKnow</a>, a website produced by <a href="https://mysociety.org/">mySociety</a> for making FOI requests in the UK.</p>
+ <p>Around 15% to 20% of requests to UK Central Government are made through WhatDoTheyKnow.com.</p>
</div>
</div>
</div><!--
--><div class="deployments__unit--major">
<div class="deployment--major">
- <img src="{{ site.baseurl }}assets/img/fyi.jpg" class="deployment__screenshot" />
- <h3 class="deployment__title">FYI </h3>
- <p class="deployment__country">New Zealand</p>
- <p class="deployment__link"><a href="https://fyi.org.nz/">https://fyi.org.nz/</a></p>
+ <img src="{{ site.baseurl }}assets/img/ki-mit-tud.jpg" class="deployment__screenshot" />
+ <h3 class="deployment__title">Ki Mit Tud</h3>
+ <p class="deployment__country">Hungary</p>
+ <p class="deployment__link"><a href="http://kimittud.atlatszo.hu/">http://kimittud.atlatszo.hu/</a></p>
<div class="deployment__description">
- <p>New Zealand’s public sector is reportedly among the least corrupt in the world. Nonetheless, Open New Zealand, the organisation behind FYI, believe that a Freedom of Information site can bring benefits.</p>
- <p>Like all Alaveteli installs, FYI simplifies the whole process of submitting a request - and publishes requests and their responses online, for all to see. </p>
+ <p>Hungarians have a right, enshrined in their law, to demand information from any tax-funded body. Ki Mit Tud (“Who Knows What?”) radically simplifies that process for the citizen.</p>
+ <p>Using the Alaveteli platform, Ki Mit Tud was launched in May 2012, and within its first year had processed over 1,000 freedom of information requests.</p>
</div>
</div>
</div><!--
--><div class="deployments__unit--major">
+ <div class="deployment--major">
+ <img src="{{ site.baseurl }}assets/img/fyi.jpg" class="deployment__screenshot" />
+ <h3 class="deployment__title">FYI </h3>
+ <p class="deployment__country">New Zealand</p>
+ <p class="deployment__link"><a href="https://fyi.org.nz/">https://fyi.org.nz/</a></p>
+ <div class="deployment__description">
+ <p>New Zealand’s public sector is reportedly among the least corrupt in the world. Nonetheless, Open New Zealand, the organisation behind FYI, believe that a Freedom of Information site can bring benefits.</p>
+ <p>Like all Alaveteli installs, FYI simplifies the whole process of submitting a request - and publishes requests and their responses online, for all to see. </p>
+ </div>
+ </div>
+ </div><!--
+ --><div class="deployments__unit--major">
<div class="deployment--major">
<img src="{{ site.baseurl }}assets/img/tu-derecho-a-saber.jpg" class="deployment__screenshot" />
<h3 class="deployment__title">Tu Derecho A Saber</h3>
@@ -165,22 +177,6 @@ in any language, and within any legislation</p>
<p class="deployment__country">Serbia</p>
<p class="deployment__link"><a href="http://daznamosvi.rs/sr">http://daznamosvi.rs/sr</a></p>
</div>
- </div><!--
- --><div class="deployments__unit--minor">
- <div class="deployment--minor">
- <img src="{{ site.baseurl }}assets/img/ask-your-gov.jpg" class="deployment__screenshot" />
- <h3 class="deployment__title">Ask Your Government</h3>
- <p class="deployment__country">Uganda</p>
- <p class="deployment__link"><a href="http://askyourgov.ug/">http://askyourgov.ug/</a></p>
- </div>
- </div><!--
- --><div class="deployments__unit--minor">
- <div class="deployment--minor">
- <img src="{{ site.baseurl }}assets/img/what-do-they-know.jpg" class="deployment__screenshot" />
- <h3 class="deployment__title">WhatDoTheyKnow</h3>
- <p class="deployment__country">United Kingdom</p>
- <p class="deployment__link"><a href="https://www.whatdotheyknow.com/">https://www.whatdotheyknow.com/</a></p>
- </div>
</div>
</div>
</div>
diff --git a/docs/customising/config.md b/docs/customising/config.md
index 2528adefc..8a25e8df6 100644
--- a/docs/customising/config.md
+++ b/docs/customising/config.md
@@ -14,7 +14,7 @@ title: Configuration
The alaveteli code ships with an example configuration file: `config/general.yml-example`.
-As part of the [installation process]({{ site.baseurl }}docs/installing ), the
+As part of the [installation process]({{ site.baseurl }}docs/installing/ ), the
example file gets copied to `config/general.yml`. You **must** edit this file to
suit your needs.
@@ -230,7 +230,7 @@ indentation correct. If in doubt, look at the examples already in the file, and
<p>Example:</p>
<ul class="examples">
<li>
- <code>BLOG_FEED: 'http://www.mysociety.org/category/projects/whatdotheyknow/feed/'</code>
+ <code>BLOG_FEED: 'https://www.mysociety.org/category/projects/whatdotheyknow/feed/'</code>
</li>
</ul>
</div>
@@ -372,7 +372,7 @@ indentation correct. If in doubt, look at the examples already in the file, and
<a name="theme_urls"><code>THEME_URLS</code></a>
</dt>
<dd>
- URLs of <a href="{{ site.baseurl }}docs/customising/themes">themes</a> to download and use
+ URLs of <a href="{{ site.baseurl }}docs/customising/themes/">themes</a> to download and use
(when running the <code>rails-post-deploy</code> script). The earlier in the list means
the templates have a higher priority.
<div class="more-info">
@@ -392,7 +392,7 @@ THEME_URLS:
<a name="theme_branch"><code>THEME_BRANCH</code></a>
</dt>
<dd>
- When <code>rails-post-deploy</code> installs the <a href="{{ site.baseurl }}docs/customising/themes">themes</a>,
+ When <code>rails-post-deploy</code> installs the <a href="{{ site.baseurl }}docs/customising/themes/">themes</a>,
it will try the theme branch first, but only if you've set <code>THEME_BRANCH</code>
to be true. If the branch doesn't exist it will fall back to using a tagged version
specific to your installed alaveteli version, and if that doesn't exist it will
@@ -951,7 +951,7 @@ EXCEPTION_NOTIFICATIONS_TO:
<p>Example:</p>
<ul class="examples">
<li>
- <code>DONATION_URL: "http://www.mysociety.org/donate/"</code>
+ <code>DONATION_URL: "https://www.mysociety.org/donate/"</code>
</li>
</ul>
</div>
diff --git a/docs/customising/index.md b/docs/customising/index.md
index 4b8cf9fda..19100ad20 100644
--- a/docs/customising/index.md
+++ b/docs/customising/index.md
@@ -15,7 +15,7 @@ title: Customising
## Configuration settings
You can customise much of Alaveteli's behaviour just by editing the configuration
-file. This [complete list of Alaveteli's config settings]({{ site.baseurl }}docs/customising/config)
+file. This [complete list of Alaveteli's config settings]({{ site.baseurl }}docs/customising/config/)
shows the sort of things you can control in this way.
<!-- TODO key settings -->
@@ -24,7 +24,7 @@ shows the sort of things you can control in this way.
It's common to want to change the basic appearance of the site. Although you
can simply edit the default templates and CSS to do this, we **strongly
-recommend** that you [create a theme]({{ site.baseurl }}docs/customising/themes).
+recommend** that you [create a theme]({{ site.baseurl }}docs/customising/themes/).
Themes do not need to be especially complex, but they allow your changes to
work alongside the core code, which you can then update (when new releases or
@@ -32,13 +32,13 @@ updates become available).
## Need Alaveteli in a different language?
-No problem! See the [information about translating Alaveteli]({{ site.baseurl }}docs/customising/translation).
+No problem! See the [information about translating Alaveteli]({{ site.baseurl }}docs/customising/translation/).
## Complex changes
If you are a developer (or you have a team of programmers available) you can
add any customisation that you want. But it's important to do this without
breaking the core code, so that you can accept new releases with updates.
-There's more detail in the [page about themes]({{ site.baseurl }}docs/customising/themes).
+There's more detail in the [page about themes]({{ site.baseurl }}docs/customising/themes/).
-See also the [documentation for developers]({{ site.baseurl }}docs/developers).
+See also the [documentation for developers]({{ site.baseurl }}docs/developers/).
diff --git a/docs/customising/themes.md b/docs/customising/themes.md
index 65410ece2..bad1639d7 100644
--- a/docs/customising/themes.md
+++ b/docs/customising/themes.md
@@ -13,13 +13,13 @@ title: Themes
</p>
When you customise your Alaveteli site, there is a lot you can change just
-by editing the [config settings]({{ site.baseurl }}docs/customising/config).
+by editing the [config settings]({{ site.baseurl }}docs/customising/config/).
But if you want to change the way the site looks, or add more specific
behaviour, you'll need to make a **theme**.
You don't need to be a programmer in order to make simple changes, but you will
need to be confident enough to copy and change some files. If you're not sure
-about this, [ask for help](/community)!
+about this, [ask for help](/community/)!
## What you might want to change
@@ -28,7 +28,7 @@ The most common requirement is to brand the site: at a minimum,
the different states that a request can go through. You'll also want
to edit the categories that public bodies can appear in (i.e. the
groupings on the left hand side of the
-"[View authorities](http://www.whatdotheyknow.com/body/list/all)" page
+"[View authorities](https://www.whatdotheyknow.com/body/list/all)" page
on WhatDoTheyKnow.
There may also be other things you want to customise -- drop a line on
@@ -49,7 +49,7 @@ code.
We try to encapsulate all site-specific functionality in one of these
places:
-* Site [configuration]({{ site.baseurl }}docs/customising/config)
+* Site [configuration]({{ site.baseurl }}docs/customising/config/)
(e.g., the name of your site, the available
languages, and so on &mdash; all in `config/general.yml`)
* Data (e.g. the public bodies to whom requests should be addressed)
@@ -137,7 +137,7 @@ locale you support.
## Customising the request states
As mentioned above, if you can possibly live with the
-[default Alaveteli request statuses]({{ site.baseurl }}docs/running/states),
+[default Alaveteli request statuses]({{ site.baseurl }}docs/running/states/),
it would be good to do so. Note that you can set how many days counts
as "overdue" in the main site config file &mdash;
see [`REPLY_LATE_AFTER_DAYS`]({{ site.baseurl }}docs/customising/config/#reply_late_after_days).
diff --git a/docs/customising/translation.md b/docs/customising/translation.md
index 4f3c39270..bcf6514e5 100644
--- a/docs/customising/translation.md
+++ b/docs/customising/translation.md
@@ -18,8 +18,7 @@ The software translations are implemented using GNU gettext, and the resource
files are managed in Transifex.
The Transifex project is at
-[https://www.transifex.net/projects/p/alaveteli](https://www.transifex.net/proje
-cts/p/alaveteli) -- you'll probably want an account there (ask on the mailing
+[https://www.transifex.net/projects/p/alaveteli](https://www.transifex.net/projects/p/alaveteli) -- you'll probably want an account there (ask on the mailing
list). It has a fairly easy-to-use interface for contributing translations.
There are three roles in the translation process, and each one is described
diff --git a/docs/developers/directory_structure.md b/docs/developers/directory_structure.md
index e073a96ce..9dbe06789 100644
--- a/docs/developers/directory_structure.md
+++ b/docs/developers/directory_structure.md
@@ -13,7 +13,7 @@ directories.</p>
Alaveteli -- this is really more useful if you're a developer planning on
making more substantive changes to the code. You don't need to be familiar with
Ruby to install or make basic [customisations to your
-installation](/docs/customising).
+installation](/docs/customising/).
<!-- (and if you do,
remember to read the page about [feeding your changes back](/feeding-back)).-->
@@ -140,7 +140,7 @@ website](http://guides.rubyonrails.org/getting_started.html).
<p><em>documentation</em></p>
<p>
These are technical notes. This is in addition to the <a
- href="http://code.fixmystreet.com">core documentation</a> &mdash; which
+ href="http://code.alaveteli.org/docs/">core documentation</a> &mdash; which
you are reading now &mdash; which is actually stored in the git
repository in the <code>gh-pages</code> branch, and published as GitHub
pages.
@@ -215,7 +215,7 @@ website](http://guides.rubyonrails.org/getting_started.html).
<dd>
<p><em>tests</em></p>
<p>
- Alaveteli's test suite runs under <a href="TODO">spec</a>.
+ Alaveteli's test suite runs under <a href="http://rspec.info/">rspec</a>.
</p>
</dd>
<dt>
diff --git a/docs/developers/index.md b/docs/developers/index.md
index f98261a77..9d1869246 100644
--- a/docs/developers/index.md
+++ b/docs/developers/index.md
@@ -12,14 +12,14 @@ title: For developers
* The software is written in **Ruby on Rails 3.x**. We support postgresql as
the backend database. A configured mail transfer agent (MTA) like exim,
postfix or sendmail is necessary to parse incoming emails. We have production
- sites deployed on Debian (Squeeze and Wheezy) and Ubuntu (10.04 and 12.04 LTS). For performance
+ sites deployed on Debian (Squeeze and Wheezy) and Ubuntu (12.04 LTS). For performance
reasons, we recommend the use of [Varnish](https://www.varnish-cache.org).
* To help you understand what the code is doing, read this [high-level
- overview]({{ site.baseurl }}docs/developers/overview), which includes a diagram of
+ overview]({{ site.baseurl }}docs/developers/overview/), which includes a diagram of
the models and how they are related.
-* See the [API documentation]({{ site.baseurl }}docs/developers/api) for how to get
+* See the [API documentation]({{ site.baseurl }}docs/developers/api/) for how to get
data into or out of Alaveteli.
* If you need to change or add strings in the interface, see our [guidelines
@@ -49,7 +49,7 @@ title: For developers
for help.
* A standard initial step for customising your deployment is [writing a
- theme]({{ site.baseurl }}docs/customising/themes). **If you only read one thing,
+ theme]({{ site.baseurl }}docs/customising/themes/). **If you only read one thing,
it should be this!**
* Like many Ruby on Rails sites, the software is not hugely performant (see
@@ -74,10 +74,9 @@ title: For developers
* If you're experiencing memory issues, [this blog post about some strategies
used in the
- past](http://www.mysociety.org/2009/09/17/whatdotheyknow-growing-pains-and-rub
- y-memory-leaks/) might be useful.
+ past](https://www.mysociety.org/2009/09/17/whatdotheyknow-growing-pains-and-ruby-memory-leaks/) might be useful.
-* If you're coding on a mac, see these [MacOS X installation notes]({{ site.baseurl }}docs/installing/macos). <!-- [[OS X Quickstart]] -->
+* If you're coding on a mac, see these [MacOS X installation notes]({{ site.baseurl }}docs/installing/macos/). <!-- [[OS X Quickstart]] -->
* We try to adhere to similar good practice across all our projects: see
[mysociety.github.io](http://mysociety.github.io/) for things like our
diff --git a/docs/developers/overview.md b/docs/developers/overview.md
index 8193528ce..af312f997 100644
--- a/docs/developers/overview.md
+++ b/docs/developers/overview.md
@@ -43,7 +43,7 @@ ensure they have an envelope-from header set (to combat spam).
## Schema diagram
-<a name="schema-diagram" href="{{ site.baseurl }}assets/img/railsmodels.png"><img src="{{ site.baseurl }}assets/img/railsmodels.png"></a>
+<a href="{{ site.baseurl }}assets/img/railsmodels.png"><img src="{{ site.baseurl }}assets/img/railsmodels.png"></a>
This schema for the Rails models was generated from the code on 19 Dec 2012 using
[Railroad](http://railroad.rubyforge.org/).
diff --git a/docs/getting_started.md b/docs/getting_started.md
index 43069a918..88e5723f7 100644
--- a/docs/getting_started.md
+++ b/docs/getting_started.md
@@ -12,8 +12,8 @@ title: Getting started
For inspiration, take a look at some of the existing Alaveteli websites, like
[tuderechoasaber.es](http://tuderechoasaber.es) (Spain),
-[AskTheEU](http://asktheeu.org) (EU), or
-[WhatDoTheyKnow](http://www.whatdotheyknow.com) (UK). These sites all use the
+[AskTheEU](http://www.asktheeu.org) (EU), or
+[WhatDoTheyKnow](https://www.whatdotheyknow.com) (UK). These sites all use the
Alaveteli software, plus their own custom themes installed on top to make them
look different.
@@ -68,7 +68,7 @@ Alaveteli.
>
> -- _Pedro Markun, Queremos Saber_
-[AskTheEU](http://asktheeu.org), a much more complete and polished version with
+[AskTheEU](http://www.asktheeu.org), a much more complete and polished version with
a custom theme and several other customisations, took a team of 2 or 3 people
about 3 months (part time) to complete.
@@ -112,11 +112,11 @@ with this. The minimum spec for running a low traffic website is 512MB RAM and
a 20GB disk. 2GB RAM would be ideal. We recommend Debian Squeeze 64-bit as the
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 }}docs/installing).
+should follow the [installation documentation]({{ site.baseurl }}docs/installing/).
Alternatively, you could use Amazon Web Services. This has the
added advantage that you can use our preconfigured [Alaveteli EC2
-AMI]({{ site.baseurl }}docs/installing/ami) to get you
+AMI]({{ site.baseurl }}docs/installing/ami/) to get you
started almost instantly. However, it's more expensive than Rackspace,
especially if you want more RAM.
@@ -310,7 +310,7 @@ review the untranslated strings.
## Step five: Test drive the site
For launch, the tech person should review the [Production Server Best
-Practices]({{ site.baseurl }}docs/running/server).
+Practices]({{ site.baseurl }}docs/running/server/).
A low-key launch, where you tell just a few trusted people about the site, is a
very good idea. You can then track how things work, and gauge the responses of
@@ -369,7 +369,7 @@ website is. To ensure its success, you should be doing things like:
* Recruiting volunteers to help with the site
* Categorising uncategorised requests
-See also the [Administrator's Manual](/docs/running/admin_manual), which describes
+See also the [Administrator's Manual](/docs/running/admin_manual/), which describes
some of the typical tasks you'll need to perform when your site is up and
running.
diff --git a/docs/glossary.md b/docs/glossary.md
index 7e6311169..64c75c603 100644
--- a/docs/glossary.md
+++ b/docs/glossary.md
@@ -49,11 +49,11 @@ Definitions
</dt>
<dd>
<strong>Alaveteli</strong> is the name of the open source software platform created
- by <a href="http://www.mysociety.org">mySociety</a> for submitting,
+ by <a href="https://www.mysociety.org">mySociety</a> for submitting,
managing and archiving Freedom of Information requests.
<p>
It grew from the successful FOI UK project
- <a href="http://www.whatdotheyknow.com">WhatDoTheyKnow</a>.
+ <a href="https://www.whatdotheyknow.com">WhatDoTheyKnow</a>.
We use the name <em>Alaveteli</em> to distinguish the software
that runs the platform from any specific website that it is powering.
</p>
@@ -154,7 +154,7 @@ Definitions
<p>More information:</p>
<ul>
<li>
- how to <a href="{{ site.baseurl }}docs/installing/deploy">deploy Alaveteli</a> (and why it's
+ how to <a href="{{ site.baseurl }}docs/installing/deploy/">deploy Alaveteli</a> (and why it's
a good idea)
</li>
<li>
@@ -224,7 +224,7 @@ Definitions
<p>More information:</p>
<ul>
<li>
- Wikipedia summary of <a href="http://http://en.wikipedia.org/wiki/Freedom_of_information_laws_by_country">FOI laws by country</a>.
+ Wikipedia summary of <a href="http://en.wikipedia.org/wiki/Freedom_of_information_laws_by_country">FOI laws by country</a>.
</li>
</ul>
</div>
@@ -238,7 +238,7 @@ Definitions
helps us track changes to the code, and also makes it easy for other people
to duplicate and even contribute to our software.
<p>
- The website <a href="http://github.com/mysociety">github.com</a> is a central, public
+ The website <a href="https://github.com/mysociety">github.com</a> is a central, public
place where we make our software available. Because it's Open Source, you can
inspect the code there (Alaveteli is mostly written in the programming language
Ruby), report bugs, suggest features and many other useful things.
@@ -253,7 +253,7 @@ Definitions
<p>More information:</p>
<ul>
<li>
- See the <a href="{{ site.baseurl }}docs/installing">installation instructions</a> which will
+ See the <a href="{{ site.baseurl }}docs/installing/">installation instructions</a> which will
clone the Alaveteli repo.
</li>
<li>
@@ -261,7 +261,7 @@ Definitions
href="http://git-scm.com">official website</a>.
</li>
<li>
- See <a href="http://github.com/mysociety">the mySociety projects on
+ See <a href="https://github.com/mysociety">the mySociety projects on
github</a>.
</li>
</ul>
@@ -278,7 +278,7 @@ Definitions
<p>More information:</p>
<ul>
<li>
- see the <a href="{{ site.baseurl }}docs/running/admin_manual">admin manual</a> for
+ see the <a href="{{ site.baseurl }}docs/running/admin_manual/">admin manual</a> for
information on dealing with emails in the holding pen
</li>
</ul>
@@ -297,7 +297,7 @@ Definitions
<p>More information:</p>
<ul>
<li>
- see these instructions for <a href="{{ site.baseurl }}docs/installing/email">configuring your MTA</a>
+ see these instructions for <a href="{{ site.baseurl }}docs/installing/email/">configuring your MTA</a>
(examples are for exim4 and postfix, two of the most common)
</li>
</ul>
@@ -318,7 +318,7 @@ Definitions
<li>
use the <code>agent_enabled:</code> setting in the
the <code>newrelic.yml</code> config file to enable the New Relic analytics.
- See the <a href="{{ site.baseurl }}docs/installing/manual_install">manual installation</a> instructions.
+ See the <a href="{{ site.baseurl }}docs/installing/manual_install/">manual installation</a> instructions.
</li>
<li>
see also the New Relic Ruby Agent <a href="https://github.com/newrelic/rpm">github repo</a> and
@@ -584,15 +584,15 @@ Definitions
<p>More information:</p>
<ul>
<li>
- <a href="{{ site.baseurl }}docs/running/states">example states for WhatDoTheyKnow</a>
+ <a href="{{ site.baseurl }}docs/running/states/">example states for WhatDoTheyKnow</a>
(Alaveteli site running in the UK)
</li>
<li>
- for comparison, <a href="{{ site.baseurl }}docs/running/states_informatazyrtare">example states for InformataZyrtare</a>
+ for comparison, <a href="{{ site.baseurl }}docs/running/states_informatazyrtare/">example states for InformataZyrtare</a>
(Alaveteli site running in Kosovo)
</li>
<li>
- to customise or add your own states, see <a href="{{ site.baseurl }}docs/customising/themes">Customising the request states</a>
+ to customise or add your own states, see <a href="{{ site.baseurl }}docs/customising/themes/">Customising the request states</a>
</li>
</ul>
</div>
@@ -610,7 +610,7 @@ Definitions
<p>More information:</p>
<ul>
<li>
- <a href="{{ site.baseurl }}docs/customising/themes">about themes</a>
+ <a href="{{ site.baseurl }}docs/customising/themes/">about themes</a>
</li>
</ul>
</div>
diff --git a/docs/index.md b/docs/index.md
index e62eb7b5d..b8cc66b48 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -8,7 +8,7 @@ title: Welcome
<p class="lead">
This is the documentation for Alaveteli,
an open source Freedom of Information platform
- created by <a href="http://www.mysociety.org">mySociety</a>.
+ created by <a href="https://www.mysociety.org">mySociety</a>.
</p>
## New to Alaveteli?
@@ -19,16 +19,16 @@ You've found the documentation for Alaveteli.
* Read [Turbo Transparency](/assets/files/Turbo-Transparency-v1.0.pdf), a paper about how and why to use Alaveteli for Freedom of Information systems
-* Read the [Getting Started guide]({{ site.baseurl }}docs/getting_started)
+* Read the [Getting Started guide]({{ site.baseurl }}docs/getting_started/)
**The documentation covers
-[installing]({{ site.baseurl }}docs/installing),
-[customising]({{ site.baseurl }}docs/customising), and
-[running]({{ site.baseurl }}docs/running) your own Alaveteli site.**
+[installing]({{ site.baseurl }}docs/installing/),
+[customising]({{ site.baseurl }}docs/customising/), and
+[running]({{ site.baseurl }}docs/running/) your own Alaveteli site.**
If you're making changes to the source code, we have
-[documentation for developers]({{ site.baseurl }}docs/developers) too.
+[documentation for developers]({{ site.baseurl }}docs/developers/) too.
If you are an organisation who wants to use Alaveteli in your jurisdiction, or a developer who is interested in collaborating on the software, please
-[get in touch]({{ site.baseurl }}community).
+[get in touch]({{ site.baseurl }}community/).
diff --git a/docs/installing/ami.md b/docs/installing/ami.md
index 42f2907cb..1f7195761 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.
</p>
-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
@@ -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
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/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..c46bdf4ba 100644
--- a/docs/installing/macos.md
+++ b/docs/installing/macos.md
@@ -11,7 +11,7 @@ title: Installing on MacOS X
help.
</p>
-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
@@ -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
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. <em>You don't necessarily need to do it this
way:</em> it's usually easier to use the
- <a href="{{ site.baseurl }}docs/installing/script">installation script</a>
+ <a href="{{ site.baseurl }}docs/installing/script/">installation script</a>
or the
- <a href="{{ site.baseurl }}docs/installing/ami">Amazon EC2 AMI</a>.
+ <a href="{{ site.baseurl }}docs/installing/ami/">Amazon EC2 AMI</a>.
</p>
-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.
</p>
-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
diff --git a/docs/running/admin_manual.md b/docs/running/admin_manual.md
index a5f7e174e..77bacdf1b 100644
--- a/docs/running/admin_manual.md
+++ b/docs/running/admin_manual.md
@@ -6,14 +6,14 @@ title: Administrator's guide
# Alaveteli administrator's guide
<p class="lead">
- What is it like running an Alaveteli site? This guide explains what you can expect, and the types of problem that you might encounter. It includes examples of how mySociety manages their own <a href="/docs/glossary/#foi" class="glossary">Freedom of Information</a> site, <a href="http://www.whatdotheyknow.com">whatdotheyknow.com</a>.
+ What is it like running an Alaveteli site? This guide explains what you can expect, and the types of problem that you might encounter. It includes examples of how mySociety manages their own <a href="/docs/glossary/#foi" class="glossary">Freedom of Information</a> site, <a href="https://www.whatdotheyknow.com">whatdotheyknow.com</a>.
</p>
## What's involved?
The overhead in managing a successful FOI website is quite high. Richard, a
volunteer, wrote a [blog
-post](http://www.mysociety.org/2009/10/13/behind-whatdotheyknow/) about some of
+post](https://www.mysociety.org/2009/10/13/behind-whatdotheyknow/) about some of
this in 2009.
WhatDoTheyKnow usually has about 3 active volunteers at any one time managing
diff --git a/docs/running/index.md b/docs/running/index.md
index 3db94f713..90461fb3e 100644
--- a/docs/running/index.md
+++ b/docs/running/index.md
@@ -16,13 +16,13 @@ site, you need to make sure day-to-day tasks get done too. Most Alaveteli sites
are run by a team who allocate some time every day to user support and generally keeping
the project up to date.
-* the [administrator's guide]({{ site.baseurl }}docs/running/admin_manual) describes
+* the [administrator's guide]({{ site.baseurl }}docs/running/admin_manual/) describes
what you need to do and know to run your site
* we've prepared a checklist of
- [things to consider]({{ site.baseurl }}docs/running/server)
+ [things to consider]({{ site.baseurl }}docs/running/server/)
when setting up your production server
-* see the [different states a request can be in]({{ site.baseurl }}docs/running/states)
+* see the [different states a request can be in]({{ site.baseurl }}docs/running/states/)
diff --git a/docs/running/server.md b/docs/running/server.md
index 63ec1800f..c10d4b4b4 100644
--- a/docs/running/server.md
+++ b/docs/running/server.md
@@ -25,7 +25,7 @@ ask us about hosting.
## Cron jobs
Don't forget to set up the cron jobs as outlined in the
-[installation instructions]({{ site.baseurl }}docs/installing/manual_install).
+[installation instructions]({{ site.baseurl }}docs/installing/manual_install/).
As of October 2011, they rely on a small program created by mySociety called
`run-with-lockfile`. A discussion of where the source for this can be found,
and possible alternatives, lives in
@@ -36,7 +36,7 @@ and possible alternatives, lives in
We recommend running your site behind
[Apache](https://httpd.apache.org) +
[Passenger](https://www.phusionpassenger.com). Refer to the
-[installation instructions]({{ site.baseurl }}docs/installing/manual_install)
+[installation instructions]({{ site.baseurl }}docs/installing/manual_install/)
regarding `PassengerMaxPoolSize`, which you should
experiment with to match your available RAM. It is very unlikely that you'll
ever need a pool larger than [Passenger's
@@ -49,7 +49,7 @@ Alaveteli ships with a
## Security
-You _must_ change all key-related [config settings]({{ site.baseurl }}docs/customising/config)
+You _must_ change all key-related [config settings]({{ site.baseurl }}docs/customising/config/)
in `general.yml` from their default values. This includes (but may not be limited to!)
these settings:
@@ -76,11 +76,10 @@ deliverability of your email:
* Set up [SPF records](http://www.openspf.org/) for your domain
* Set up <a
- href="http://en.wikipedia.org/wiki/Feedback_loop_(email)#Feedback_loop_links_f
- or_some_email_providers">feedback loops</a> with the main email providers
+ href="http://wiki.asrg.sp.am/wiki/Feedback_loop_links_for_some_email_providers">feedback loops</a> with the main email providers
(Hotmail and Yahoo! are recommended)
* Especially if deploying from Amazon EC2, use an external SMTP relay for
- sending outgoing mail. See [Alaveteli EC2 AMI]( {{ site.baseurl }}docs/installing/ami)
+ sending outgoing mail. See [Alaveteli EC2 AMI]( {{ site.baseurl }}docs/installing/ami/)
for more suggestions.
## Backup
diff --git a/docs/running/states.md b/docs/running/states.md
index 73e49eba7..1c3fb217e 100644
--- a/docs/running/states.md
+++ b/docs/running/states.md
@@ -15,16 +15,16 @@ The request states are defined in the Alaveteli code, and we recommend you use
them (provided they match the <a href="{{ site.baseurl }}docs/glossary/#foi"
class="glossary">FOI law</a> in your own jurisdiction). But if you do need to
customise them, you can &mdash; see
-<a href="{{ site.baseurl }}docs/customising/themes">Customising the request states</a> for details.
+<a href="{{ site.baseurl }}docs/customising/themes/">Customising the request states</a> for details.
## WhatDoTheyKnow example
-Requests made on the UK's Alaveteli instance, [WhatDoTheyKnow](http://www.whatdotheyknow.com),
+Requests made on the UK's Alaveteli instance, [WhatDoTheyKnow](https://www.whatdotheyknow.com),
may be in any of the states described below.
Note that your site doesn't need to use the same states as WhatDoTheyKnow does. For example,
Kosovo's instance uses slightly different states: see
-[this comparison of their differences]({{ site.baseurl }}docs/running/states_informatazyrtare).
+[this comparison of their differences]({{ site.baseurl }}docs/running/states_informatazyrtare/).
### States
diff --git a/docs/running/states_informatazyrtare.md b/docs/running/states_informatazyrtare.md
index 8097244c5..bd5ff1a1c 100644
--- a/docs/running/states_informatazyrtare.md
+++ b/docs/running/states_informatazyrtare.md
@@ -29,7 +29,7 @@ facilitates this by allowing you to customise the states that are used.
This example is to show clearly that you can use different states depending on
your local requirements, and how that might look. See [Customising the request
-states]({{ site.baseurl }}docs/customising/themes) for details on how to do this.
+states]({{ site.baseurl }}docs/customising/themes/) for details on how to do this.
### States used by InformataZyrtare but not WDTK
@@ -45,7 +45,7 @@ states]({{ site.baseurl }}docs/customising/themes) for details on how to do this
* <a href="{{ site.baseurl }}docs/running/states/#user_withdrawn">user_withdrawn</a>
* <a href="{{ site.baseurl }}docs/running/states/#waiting_response_very_overdue">waiting_response_very_overdue</a>
-For more details, see all the [states used by WhatDoTheyKnow]({{site.baseurl}}docs/running/states)) for details.
+For more details, see all the [states used by WhatDoTheyKnow]({{site.baseurl}}docs/running/states/)) for details.
---
diff --git a/google14caf34192e45d35.html b/google14caf34192e45d35.html
new file mode 100644
index 000000000..d20107b24
--- /dev/null
+++ b/google14caf34192e45d35.html
@@ -0,0 +1 @@
+google-site-verification: google14caf34192e45d35.html \ No newline at end of file
diff --git a/google77287ac10bb8023f.html b/google77287ac10bb8023f.html
deleted file mode 100644
index cdbe0e45f..000000000
--- a/google77287ac10bb8023f.html
+++ /dev/null
@@ -1 +0,0 @@
-google-site-verification: google77287ac10bb8023f.html \ No newline at end of file
diff --git a/index.md b/index.md
index e14a35a53..0c22bdfd3 100644
--- a/index.md
+++ b/index.md
@@ -37,7 +37,7 @@ title: Welcome
</div>
<div class="what-is-alaveteli__international-reach-position">
<div class="what-is-alaveteli__international-reach">
- <p class="message">Alaveteli has helped citizens make over <strong>200,000 Freedom of Information requests</strong> in <strong>16 jurisdictions</strong></p>
+ <p class="message">Alaveteli has helped citizens make over <strong>200,000 Freedom of Information requests</strong> in <strong>18 jurisdictions</strong></p>
<p><a href="{{ site.baseurl }}deployments/">See all deployments</a></p>
</div>
</div>
@@ -99,7 +99,7 @@ title: Welcome
--><div class="features__grid-unit">
<div class="features__item">
<h3>Multilingual</h3>
- <p>Available in over sixteen languages, and you can translate it to your own</p>
+ <p>Available in twenty languages and counting, and you can translate it to your own</p>
</div>
</div><!--
--><div class="features__grid-unit">
@@ -138,7 +138,7 @@ title: Welcome
<div class="get-started__item get-started__item">
<h3>Speak to us</h3>
<p>Need some help? Tell us about your plans</p>
- <p class="push-top"><a href="{{ site.baseurl }}community" class="button">Get in touch</a></p>
+ <p class="push-top"><a href="{{ site.baseurl }}community/" class="button">Get in touch</a></p>
</div>
</div>
</div>