aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/customising/themes.md36
-rw-r--r--docs/customising/translation.md4
-rw-r--r--docs/developers/i18n.md4
-rw-r--r--docs/getting_started.md4
-rw-r--r--docs/glossary.md48
-rw-r--r--docs/installing/vagrant.md2
-rw-r--r--docs/running/admin_manual.md40
-rw-r--r--docs/running/categories_and_tags.md26
-rw-r--r--docs/running/holding_pen.md24
-rw-r--r--docs/running/requests.md32
-rw-r--r--docs/running/upgrading.md2
11 files changed, 111 insertions, 111 deletions
diff --git a/docs/customising/themes.md b/docs/customising/themes.md
index 6cb99abde..152277b3f 100644
--- a/docs/customising/themes.md
+++ b/docs/customising/themes.md
@@ -46,23 +46,23 @@ about this, [ask for help](/community/)!
We use
-<a href="{{ site.baseurl }}docs/glossary/#git" class="glossary__link">git</a>
+<a href="{{ page.baseurl }}/docs/glossary/#git" class="glossary__link">git</a>
to manage Alaveteli's source code, and Alaveteli expects your theme to be in
a git repository of its own.
Although you *can* start customising your site on your
-<a href="{{ site.baseurl }}docs/glossary/#development" class="glossary__link">development server</a>
+<a href="{{ page.baseurl }}/docs/glossary/#development" class="glossary__link">development server</a>
by playing with the `alavetelitheme` theme that Alaveteli ships with, we recommend
you make it into your own repo as soon as you can. If you're seriously customising
&mdash; and certainly before you can deploy to a
-<a href="{{ site.baseurl }}docs/glossary/#production" class="glossary__link">production server</a> &mdash;
+<a href="{{ page.baseurl }}/docs/glossary/#production" class="glossary__link">production server</a> &mdash;
you must do this. Make sure you choose a unique name for your theme (and hence its
repo). If your site is `abcexample.com`, we suggest you call your theme
something like `abcexample-theme`.
Alaveteli's `themes:install` rake task, which installs themes, works by
getting the git repo from the URL specified in the config setting
-[`THEME_URLS`]({{ site.baseurl }}docs/customising/config/#theme_urls). This is
+[`THEME_URLS`]({{ page.baseurl }}/docs/customising/config/#theme_urls). This is
why your theme must be in its own git repo.
One way to create your own theme is to fork the `alavetelitheme` theme from
@@ -75,7 +75,7 @@ you can duplicate `alivetelitheme` (in `lib/themes/`) and change its name.
Here's an example of a complex theme in action: see the theme repo at
<a href="https://github.com/mysociety/whatdotheyknow-theme">https://github.com/mysociety/whatdotheyknow-theme</a>.
This is the theme for UK's Alaveteli instance
- <a href="{{ site.baseurl}}docs/glossary/#wdtk" class="glossary__link">WhatDoTheyKnow</a>.
+ <a href="{{ page.baseurl }}/docs/glossary/#wdtk" class="glossary__link">WhatDoTheyKnow</a>.
You can see it
<a href="https://www.whatdotheyknow.com">deployed on the WhatDoTheyKnow website</a>.
This happens because the WhatDoTheyKnow server has this setting in <code>config/general.yml</code>:
@@ -92,7 +92,7 @@ The most common requirement is to brand the site: at a minimum,
[add the categories](#adding-your-own-categories-for-authorities)
that authorities can appear in (you can see these as groupings on the left-hand
side of the [View authorities](https://www.whatdotheyknow.com/body/list/all) page
-on <a href="{{ site.baseurl }}docs/glossary/#wdtk" class="glossary__link">WhatDoTheyKnow</a>).
+on <a href="{{ page.baseurl }}/docs/glossary/#wdtk" class="glossary__link">WhatDoTheyKnow</a>).
You may also want to
[tweak the different states](#customising-the-request-states) that a request can
go through.
@@ -140,7 +140,7 @@ You can also install the theme by hand, by running:
bundle exec rake themes:install
This installs whichever theme is specified by the
-[`THEME_URLS`]({{ site.baseurl }}docs/customising/config/#theme_urls)
+[`THEME_URLS`]({{ page.baseurl }}/docs/customising/config/#theme_urls)
setting.
The sample theme contains examples for nearly everything you might
@@ -149,7 +149,7 @@ use that as the basis for your own theme.
<div class="attention-box info">
The
- <code><a href="{{ site.baseurl }}docs/customising/config/#theme_urls">THEME_URLS</a></code>
+ <code><a href="{{ page.baseurl }}/docs/customising/config/#theme_urls">THEME_URLS</a></code>
setting allows you to specifiy more than one theme &mdash; but
normally you only need one.
</div>
@@ -180,7 +180,7 @@ own, for your own users.
The core templates define the layout and user interface of an Alaveteli site.
They are in `app/views/` and use
-<a href="{{ site.baseurl }}" class="glossary__link">Rails</a>'
+<a href="{{ page.baseurl }}/" class="glossary__link">Rails</a>'
ERB syntax. For example, the template for the home page lives at
`app/views/general/frontpage.html.erb`, and the template for the "about us"
page is at `app/views/help/about.html.erb`.
@@ -238,17 +238,17 @@ You can load extra stylesheets and javascript files by adding them to
## Adding your own categories for authorities
You should add
-<a href="{{ site.baseurl }}docs/glossary/#category" class="glossary__link">categories</a>
+<a href="{{ page.baseurl }}/docs/glossary/#category" class="glossary__link">categories</a>
for the authorities on your site -- Alaveteli will display the authorities grouped
by categories if you have set any up. Alaveteli uses
-<a href="{{ site.baseurl }}docs/glossary/#tag" class="glossary__link">tags</a>
+<a href="{{ page.baseurl }}/docs/glossary/#tag" class="glossary__link">tags</a>
to assign authorities to the right categories, but you should add tags anyway
because they are also used by the site's search facility. Together, categories
and tags help your users find the right authority for their request.
You can set all this up using the
-<a href="{{ site.baseurl }}docs/glossary/#admin" class="glossary__link">admin interface</a>.
-See [more about categories and tags]({{ site.baseurl }}docs/running/categories_and_tags/)
+<a href="{{ page.baseurl }}/docs/glossary/#admin" class="glossary__link">admin interface</a>.
+See [more about categories and tags]({{ page.baseurl }}/docs/running/categories_and_tags/)
for details.
## Customising the request states
@@ -313,24 +313,24 @@ The important pages to customise and translate are listed here. We note where Al
* [contact](https://github.com/mysociety/alaveteli/blob/master/app/views/help/contact.html.erb): how to get in touch
-* [credits](https://github.com/mysociety/alaveteli/blob/master/app/views/help/credits.html.erb): who is involved in the site. Importantly, includes [a section](https://github.com/mysociety/alaveteli/blob/master/app/views/help/credits.html.erb#L71) on how users can help the project. Users are referred to this section if they categorise all the requests in the [categorisation game]({{ site.baseurl }}docs/glossary/#categorisation-game).
+* [credits](https://github.com/mysociety/alaveteli/blob/master/app/views/help/credits.html.erb): who is involved in the site. Importantly, includes [a section](https://github.com/mysociety/alaveteli/blob/master/app/views/help/credits.html.erb#L71) on how users can help the project. Users are referred to this section if they categorise all the requests in the [categorisation game]({{ page.baseurl }}/docs/glossary/#categorisation-game).
* [officers](https://github.com/mysociety/alaveteli/blob/master/app/views/help/officers.html.erb): 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.html.erb): 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. Users are referred to the [section on this page](https://github.com/mysociety/alaveteli/blob/master/app/views/help/privacy.html.erb#L114) about what to do if the authority says they only have a paper copy of the information requested if the user classifies their request as ['gone postal']({{ site.baseurl }}docs/customising/states/#gone_postal).
+* [privacy](https://github.com/mysociety/alaveteli/blob/master/app/views/help/privacy.html.erb): 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. Users are referred to the [section on this page](https://github.com/mysociety/alaveteli/blob/master/app/views/help/privacy.html.erb#L114) about what to do if the authority says they only have a paper copy of the information requested if the user classifies their request as ['gone postal']({{ page.baseurl }}/docs/customising/states/#gone_postal).
* [requesting](https://github.com/mysociety/alaveteli/blob/master/app/views/help/requesting.html.erb): 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. Users are referred to the [section on how quickly a response to their request should arrive](https://github.com/mysociety/alaveteli/blob/master/app/views/help/requesting.html.erb#L125) when their request is overdue for a response. They are referred to the [section on what to do if the Alaveteli site isn't showing the authority they want to request information](https://github.com/mysociety/alaveteli/blob/master/app/views/help/requesting.html.erb#L30) from the page that allows them to list and search authorities.
* [unhappy](https://github.com/mysociety/alaveteli/blob/master/app/views/help/unhappy.html.erb): 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. In particular users are referred to the [section on using other means](https://github.com/mysociety/alaveteli/blob/master/app/views/help/unhappy.html.erb#L83) to get their question answered. If the user has requested an internal review of their request, they are referred to [the section on this page](https://github.com/mysociety/alaveteli/blob/master/app/views/help/unhappy.html.erb#L28) that describes the law relating to how long a review should take.
-* [why email](https://github.com/mysociety/alaveteli/blob/master/app/views/help/_why_they_should_reply_by_email.html.erb): a snippet of information that explains why users should insist on replies by email. This is displayed next to requests that have ["gone postal"]({{ site.baseurl }}docs/customising/states/#gone_postal) - where the authority has asked for the user's physical address so that they can reply with a paper response.
+* [why email](https://github.com/mysociety/alaveteli/blob/master/app/views/help/_why_they_should_reply_by_email.html.erb): a snippet of information that explains why users should insist on replies by email. This is displayed next to requests that have ["gone postal"]({{ page.baseurl }}/docs/customising/states/#gone_postal) - where the authority has asked for the user's physical address so that they can reply with a paper response.
* [sidebar](https://github.com/mysociety/alaveteli/blob/master/app/views/help/_sidebar.html.erb): a menu for the help pages with a link to each one. You should customise this so that it includes any extra help pages you add, and doesn't include any you remove.
You can add your own help pages to your site by replacing the default
pages in your theme with your own versions, using a locale suffix for
each page to indicate what language the page is written in. No locale
-suffix is needed for pages written for the [default locale]({{ site.baseurl }}docs/customising/config/#default_locale) for the site.
+suffix is needed for pages written for the [default locale]({{ page.baseurl }}/docs/customising/config/#default_locale) for the site.
For example, [alavetelitheme contains help
pages](https://github.com/mysociety/alavetelitheme/tree/master/lib/views/help)
for the default 'en' locale and an example Spanish 'about' page. If no
@@ -355,7 +355,7 @@ level, see `alavetelitheme/lib/controller_patches.rb` and
## Quickly switching between themes
On your
-<a href="{{ site.baseurl }}docs/glossary/#development" class="glossary__link">development server</a>,
+<a href="{{ page.baseurl }}/docs/glossary/#development" class="glossary__link">development server</a>,
you can use
[`script/switch-theme.rb`](https://github.com/mysociety/alaveteli/blob/master/script/switch-theme.rb)
to set the current theme if you are working with multiple themes. This can be
diff --git a/docs/customising/translation.md b/docs/customising/translation.md
index b0210d43c..28d5c76e7 100644
--- a/docs/customising/translation.md
+++ b/docs/customising/translation.md
@@ -48,7 +48,7 @@ translators a chance to catch up -- read the rest of this page for details.
## Alaveteli's translations
You don't need to be a programmer to translate Alaveteli -- we use an external
-website called <a href="{{ site.baseurl }}docs/glossary/#transifex" class="glossary__link">Transifex</a> to help manage translations. This makes it easy for
+website called <a href="{{ page.baseurl }}/docs/glossary/#transifex" class="glossary__link">Transifex</a> to help manage translations. This makes it easy for
translators to get to work, but it does mean you (or your technical team)
need to do a little extra work to get those translations back into Alaveteli
when they are ready.
@@ -166,7 +166,7 @@ use Transifex without needing to worry about this.
As the help pages for Alaveteli contain lots of text, they're translated
outside Transifex, by translating each whole help page and replacing it
in the theme that Alaveteli is using, so that it overrides the default
-page. See the [guide to Alaveteli's themes]({{ site.baseurl }}docs/customising/themes/#customising-the-help-pages) for more
+page. See the [guide to Alaveteli's themes]({{ page.baseurl }}/docs/customising/themes/#customising-the-help-pages) for more
information on this.
## Developers and internationalisation
diff --git a/docs/developers/i18n.md b/docs/developers/i18n.md
index 128786664..c10ebeab8 100644
--- a/docs/developers/i18n.md
+++ b/docs/developers/i18n.md
@@ -7,7 +7,7 @@ title: Internationalisation (for devs)
<p class="lead">
This page describes some technical aspects of
- <a href="{{ site.baseurl }}docs/glossary/#i18n" class="glossary__link">internationalising</a>
+ <a href="{{ page.baseurl }}/docs/glossary/#i18n" class="glossary__link">internationalising</a>
the Alaveteli code. It's mostly aimed at devs who are working on the
codebase &mdash; if you just want to translate Alaveteli into your
own language, see
@@ -19,7 +19,7 @@ title: Internationalisation (for devs)
Deployed translations for the project live in ``locale/``.
-We encourage translations to be done on <a href="{{ site.baseurl }}docs/glossary/#transifex" class="glossary__link">Transifex</a>
+We encourage translations to be done on <a href="{{ page.baseurl }}/docs/glossary/#transifex" class="glossary__link">Transifex</a>
because translators can work through its web interface rather than needing to edit the
<a href="{{ page.baseurl }}/docs/glossary/#po" class="glossary__link">`.po` and `.pot` files</a>
directly. Ultimately, Transifex just captures translators'
diff --git a/docs/getting_started.md b/docs/getting_started.md
index 379ebbe36..bd8788ff3 100644
--- a/docs/getting_started.md
+++ b/docs/getting_started.md
@@ -216,7 +216,7 @@ often less. But complicated workflows might take a bit longer.
The default help pages in Alaveteli are taken from WhatDoTheyKnow, and are
therefore relevant only to the UK. You should take these pages as inspiration,
-but review their content with a view to your jurisdiction. See [the documentation on Alaveteli's themes]({{ site.baseurl }}docs/customising/themes/#customising-the-help-pages) for details
+but review their content with a view to your jurisdiction. See [the documentation on Alaveteli's themes]({{ page.baseurl }}/docs/customising/themes/#customising-the-help-pages) for details
on which pages are important, and what content they need to have.
The help pages contain some HTML. Your tech person should be able to advise on
@@ -276,7 +276,7 @@ spreadsheet. The help pages need to have one copy saved for each language; your
tech person will put them in the right place.
The web interface translations are managed and collaborated via a website
-called <a href="{{ site.baseurl }}docs/glossary/#transifex" class="glossary__link">Transifex</a>. This website allows teams of translators to collaborate in
+called <a href="{{ page.baseurl }}/docs/glossary/#transifex" class="glossary__link">Transifex</a>. This website allows teams of translators to collaborate in
one place, using a fairly easy interface.
The Alaveteli page on Transifex is at
diff --git a/docs/glossary.md b/docs/glossary.md
index c0375d2e6..94b29648c 100644
--- a/docs/glossary.md
+++ b/docs/glossary.md
@@ -192,7 +192,7 @@ Definitions
</li>
<li>
You can organise your authorities using
- <a href="{{ site.baseurl }}docs/running/categories_and_tags/">categories and tags</a>.
+ <a href="{{ page.baseurl }}/docs/running/categories_and_tags/">categories and tags</a>.
</li>
</ul>
</div>
@@ -211,12 +211,12 @@ Definitions
<ul>
<li>
Use the config setting
- <code><a href="{{site.baseurl}}docs/customising/config/#blackhole_prefix">BLACKHOLE_PREFIX</a></code>
+ <code><a href="{{ page.baseurl }}/docs/customising/config/#blackhole_prefix">BLACKHOLE_PREFIX</a></code>
to specify what this email address looks like.
</li>
<li>
Conversely, see
- <code><a href="{{site.baseurl}}docs/customising/config/#contact_email">CONTACT_EMAIL</a></code>
+ <code><a href="{{ page.baseurl }}/docs/customising/config/#contact_email">CONTACT_EMAIL</a></code>
to specify the email address to which users' emails (such as support
enquiries) will be delivered.
</li>
@@ -281,7 +281,7 @@ Definitions
authorities with specific categories.
</p>
More about
- <a href="{{ site.baseurl }}docs/running/categories_and_tags/">categories and tags</a>
+ <a href="{{ page.baseurl }}/docs/running/categories_and_tags/">categories and tags</a>
</dd>
<dt>
<a name="categorisation-game">categorisation game</a>
@@ -337,7 +337,7 @@ Definitions
which is used for testing code before it goes live.
<p>
On your dev server, you should set
- <code><a href="{{site.baseurl}}docs/customising/config/#staging_site">STAGING_SITE</a></code>
+ <code><a href="{{ page.baseurl }}/docs/customising/config/#staging_site">STAGING_SITE</a></code>
to <code>1</code>.
</p>
</dd>
@@ -356,7 +356,7 @@ Definitions
<ul>
<li>
You can add a disclosure log URL by
- <a href="{{ site.baseurl }}docs/running/admin_manual/#creating-changing-and-uploading-public-authority-data">updating authority data</a> in the admin.
+ <a href="{{ page.baseurl }}/docs/running/admin_manual/#creating-changing-and-uploading-public-authority-data">updating authority data</a> in the admin.
</li>
</ul>
</div>
@@ -379,18 +379,18 @@ Definitions
<ul>
<li>
The username and password are defined by the configuration settings
- <code><a href="{{site.baseurl}}docs/customising/config/#admin_username">ADMIN_USERNAME</a></code>
+ <code><a href="{{ page.baseurl }}/docs/customising/config/#admin_username">ADMIN_USERNAME</a></code>
and
- <code><a href="{{site.baseurl}}docs/customising/config/#admin_password">ADMIN_PASSWORD</a></code>.
+ <code><a href="{{ page.baseurl }}/docs/customising/config/#admin_password">ADMIN_PASSWORD</a></code>.
</li>
<li>
For an example of using the emergency user, see
- <a href="{{site.baseurl}}docs/installing/next_steps/#create-a-superuser-account-for-yourself">creating
+ <a href="{{ page.baseurl }}/docs/installing/next_steps/#create-a-superuser-account-for-yourself">creating
a superuser account</a>.
</li>
<li>
Disable the emergency user by setting
- <code><a href="{{site.baseurl}}docs/customising/config/#disable_emergency_user">DISABLE_EMERGENCY_USER:</a> true</code>
+ <code><a href="{{ page.baseurl }}/docs/customising/config/#disable_emergency_user">DISABLE_EMERGENCY_USER:</a> true</code>
</li>
</ul>
</div>
@@ -520,12 +520,12 @@ Definitions
<p>
Often you don't need to worry about the details of how this is done
because once you've configured your site's
- <code><a href="{{ site.baseurl }}docs/customising/config/#default_locale">DEFAULT_LOCALE</a></code>
+ <code><a href="{{ page.baseurl }}/docs/customising/config/#default_locale">DEFAULT_LOCALE</a></code>
Alaveteli takes care of it for you.
But when you do need to work on i18n (for example, if you're customising
your site by
- <a href="{{ site.baseurl }}docs/customising/translation/">translating</a> it, or
- <a href="{{ site.baseurl }}docs/running/admin_manual/#creating-changing-and-uploading-public-authority-data">uploading names</a>
+ <a href="{{ page.baseurl }}/docs/customising/translation/">translating</a> it, or
+ <a href="{{ page.baseurl }}/docs/running/admin_manual/#creating-changing-and-uploading-public-authority-data">uploading names</a>
of the public bodies in more than one language) at the very least you may
need to know the language codes you're site is using.
</p>
@@ -533,7 +533,7 @@ Definitions
<p>More information:</p>
<ul>
<li>
- More about <a href="{{ site.baseurl }}docs/developers/i18n/">internationalising Alaveteli</a>
+ More about <a href="{{ page.baseurl }}/docs/developers/i18n/">internationalising Alaveteli</a>
</li>
<li>
See mySociety's
@@ -648,7 +648,7 @@ Definitions
example, caching is enabled, and debugging switched off.
<a href="#rails" class="glossary__link">Rails</a> has a "production mode" which does
this for you: set
- <code><a href="{{site.baseurl}}docs/customising/config/#staging_site">STAGING_SITE</a></code>
+ <code><a href="{{ page.baseurl }}/docs/customising/config/#staging_site">STAGING_SITE</a></code>
to <code>0</code>. Note that if you <em>change</em> this setting after you've
deployed, the <code>rails_env.rb</code> file that enables Rails's production
mode won't be created until you run <code>rails-post-deploy</code>.
@@ -694,7 +694,7 @@ Definitions
<ul>
<li>
You can add a publication scheme URL by
- <a href="{{ site.baseurl }}docs/running/admin_manual/#creating-changing-and-uploading-public-authority-data">updating authority data</a> in the admin.
+ <a href="{{ page.baseurl }}/docs/running/admin_manual/#creating-changing-and-uploading-public-authority-data">updating authority data</a> in the admin.
</li>
</ul>
</div>
@@ -715,9 +715,9 @@ Definitions
<ul>
<li>
use the config settings
- <code><a href="{{site.baseurl}}docs/customising/config/#recaptcha_public_key">RECAPTCHA_PUBLIC_KEY</a></code>
+ <code><a href="{{ page.baseurl }}/docs/customising/config/#recaptcha_public_key">RECAPTCHA_PUBLIC_KEY</a></code>
and
- <code><a href="{{site.baseurl}}docs/customising/config/#recaptcha_private_key">RECAPTCHA_PRIVATE_KEY</a></code>
+ <code><a href="{{ page.baseurl }}/docs/customising/config/#recaptcha_private_key">RECAPTCHA_PRIVATE_KEY</a></code>
to set this up.
</li>
<li>
@@ -821,11 +821,11 @@ Definitions
</li>
<li>
We try to coordinate releases with any active translation work too.
- See <a href="{{ site.baseurl }}docs/customising/translation/">translating
+ See <a href="{{ page.baseurl }}/docs/customising/translation/">translating
Alaveteli</a> for more information.
</li>
<li>
- We encourage you use the <a href="{{site.baseurl}}docs/installing/deploy/">deployment
+ We encourage you use the <a href="{{ page.baseurl }}/docs/installing/deploy/">deployment
mechanism</a>, which makes it easier to keep your production server up-to-date.
</li>
</ul>
@@ -917,7 +917,7 @@ Definitions
<ul>
<li>
To add addresses to the spam address list , see
- <a href="{{ site.baseurl }}docs/running/admin_manual/#rejecting-spam-that-arrives-in-the-holding-pen">Rejecting
+ <a href="{{ page.baseurl }}/docs/running/admin_manual/#rejecting-spam-that-arrives-in-the-holding-pen">Rejecting
spam that arrives in the holding pen</a>.
</li>
<li>
@@ -939,7 +939,7 @@ Definitions
site your users visit running with live data.
<p>
On your staging server, you should set
- <code><a href="{{site.baseurl}}docs/customising/config/#staging_site">STAGING_SITE</a></code>
+ <code><a href="{{ page.baseurl }}/docs/customising/config/#staging_site">STAGING_SITE</a></code>
to <code>1</code>.
</p>
<p>
@@ -1034,7 +1034,7 @@ Definitions
<ul>
<li>
More about
- <a href="{{ site.baseurl }}docs/running/categories_and_tags/">categories and tags</a>
+ <a href="{{ page.baseurl }}/docs/running/categories_and_tags/">categories and tags</a>
</li>
</ul>
</div>
@@ -1053,7 +1053,7 @@ Definitions
<p>More information:</p>
<ul>
<li>
- <a href="{{ site.baseurl }}docs/customising/themes/">about themes</a>
+ <a href="{{ page.baseurl }}/docs/customising/themes/">about themes</a>
</li>
</ul>
</div>
diff --git a/docs/installing/vagrant.md b/docs/installing/vagrant.md
index 4ef091f3a..0e260e81b 100644
--- a/docs/installing/vagrant.md
+++ b/docs/installing/vagrant.md
@@ -23,7 +23,7 @@ scripts will create you a Vagrant VM based on the server edition of
Ubuntu 12.04 LTS that contains everything you need to work on Alaveteli.
1. Get a copy of Alaveteli from
- <a href="{{ site.baseurl }}docs/glossary/#git" class="glossary__link">GitHub</a>:
+ <a href="{{ page.baseurl }}/docs/glossary/#git" class="glossary__link">GitHub</a>:
# on your machine
$ git clone git@github.com:mysociety/alaveteli.git
diff --git a/docs/running/admin_manual.md b/docs/running/admin_manual.md
index d386e4dc0..b05ddb5f4 100644
--- a/docs/running/admin_manual.md
+++ b/docs/running/admin_manual.md
@@ -346,11 +346,11 @@ have extra privileges in the main website front end. Administrators can:
### Removing a message from the holding pen
Alaveteli puts incoming messages (that is,
-<a href="{{ site.baseurl }}docs/glossary/#reponse" class="glossary__link">responses</a>)
+<a href="{{ page.baseurl }}/docs/glossary/#reponse" class="glossary__link">responses</a>)
into the
-<a href="{{ site.baseurl }}docs/glossary/#holding_pen" class="glossary__link">holding pen</a>
+<a href="{{ page.baseurl }}/docs/glossary/#holding_pen" class="glossary__link">holding pen</a>
if their `To:` email addresses can't automatically be associated with a
-<a href="{{ site.baseurl }}docs/glossary/#reponse" class="glossary__link">request</a>.
+<a href="{{ page.baseurl }}/docs/glossary/#reponse" class="glossary__link">request</a>.
The two most common reasons for this are:
@@ -362,7 +362,7 @@ When this happens, the messages wait in the holding pen until an administrator
redelivers them to the correct request, or else deletes them.
To do this, log into the
-The <a href="{{ site.baseurl }}docs/glossary/#admin" class="glossary__link">admin interface</a>
+The <a href="{{ page.baseurl }}/docs/glossary/#admin" class="glossary__link">admin interface</a>
at `/admin`. If there are any messages in the holding pen, you'll see this
message under the title *Things to do*:
@@ -418,13 +418,13 @@ in the holding pen, and is shown instead on the public request page.
### Rejecting spam that arrives in the holding pen
Alaveteli maintains a
-<a href="{{ site.baseurl }}docs/glossary/#spam-address-list" class="glossary__link">spam address list</a>.
+<a href="{{ page.baseurl }}/docs/glossary/#spam-address-list" class="glossary__link">spam address list</a>.
Any incoming message to an email address on that list
*that would otherwise be put in the holding pen* will be rejected and won't
appear in the admin.
If you see spam messages in the
-<a href="{{ site.baseurl }}docs/glossary/#holding_pen" class="glossary__link">holding pen</a>,
+<a href="{{ page.baseurl }}/docs/glossary/#holding_pen" class="glossary__link">holding pen</a>,
check if they are being sent to a *specific* email address. If they are, that
email address has become a "spam-target" and you should add it to the spam
address list. Thereafter, Alaveteli will automatically reject any messages that
@@ -435,7 +435,7 @@ messages end up in the holding pen) becomes a spam-target once it's been
harvested by spammers. There are several reasons why such an invalid address
might exist &mdash; perhaps it was mis-spelled in a manual reply, for example.
Our experience from running
-<a href="{{ site.baseurl }}docs/glossary/#wdtk" class="glossary__link">WhatDoTheyKnow</a>
+<a href="{{ page.baseurl }}/docs/glossary/#wdtk" class="glossary__link">WhatDoTheyKnow</a>
is that you can safely dismiss incoming email to such addresses once they have
been targeted in this way. Legitimate emails that arrive in the holding pen
tend to be unique errors (for example, missing the last character of the email
@@ -472,7 +472,7 @@ this address.
Note that if you are seeing consistent spam email in your holding pen, you
should also consider implementing (or increasing) the anti-spam measures
running in your
-<a href="{{ site.baseurl }}docs/glossary/#mta" class="glossary__link">MTA</a>.
+<a href="{{ page.baseurl }}/docs/glossary/#mta" class="glossary__link">MTA</a>.
### Creating, changing and uploading public authority data
@@ -555,7 +555,7 @@ unrecognised column name, the import will fail.
<td><em>yes</em></td>
<td>
The URL of the authority's
- <a href="{{ site.baseurl }}docs/glossary/#publication-scheme" class="glossary__link">publication scheme</a>,
+ <a href="{{ page.baseurl }}/docs/glossary/#publication-scheme" class="glossary__link">publication scheme</a>,
if they have one
</td>
</tr>
@@ -564,7 +564,7 @@ unrecognised column name, the import will fail.
<td><em>yes</em></td>
<td>
The URL of the authority's
- <a href="{{ site.baseurl }}docs/glossary/#disclosure-log" class="glossary__link">disclosure log</a>,
+ <a href="{{ page.baseurl }}/docs/glossary/#disclosure-log" class="glossary__link">disclosure log</a>,
if they have one
</td>
</tr>
@@ -589,10 +589,10 @@ unrecognised column name, the import will fail.
changed. This means you only really need to include data you want to
update.
* Columns with "i18n suffix" can accept
- <a href="{{ site.baseurl }}docs/glossary/#i18n" class="glossary__link">internationalised</a>
+ <a href="{{ page.baseurl }}/docs/glossary/#i18n" class="glossary__link">internationalised</a>
names. Add a full stop followed by the language code, for example:
`name.es` for Spanish (`es`). This *must* be a locale you've declared in
- [`AVAILABLE_LOCALES`]({{ site.baseurl }}docs/customising/config/#available_locales).
+ [`AVAILABLE_LOCALES`]({{ page.baseurl }}/docs/customising/config/#available_locales).
If you don't specify an i18n suffix, the default language for your site is
assumed.
* You can specify a blank entry in the CSV file by having no character
@@ -690,14 +690,14 @@ Enter some text in the in the ‘Ban text’ box to explain why they have been b
### Allowing a user to make more requests
-Alaveteli has a config setting <code><a href="{{ site.baseurl }}docs/customising/config/#max_requests_per_user_per_day">MAX_REQUESTS_PER_USER_PER_DAY</a></code>,
+Alaveteli has a config setting <code><a href="{{ page.baseurl }}/docs/customising/config/#max_requests_per_user_per_day">MAX_REQUESTS_PER_USER_PER_DAY</a></code>,
which determines the maximum number of requests that a normal user can
make in a day. If they try to make more than this number of requests
within a 24 hour period, they will see a message telling them that they
have hit the limit, and encouraging them to use the contact form if they
feel they have a good reason to ask for the request limit to be lifted.
-To lift the request limit for a particular user, go to the <a href="{{ site.baseurl }}docs/glossary/#admin" class="glossary__link">admin
+To lift the request limit for a particular user, go to the <a href="{{ page.baseurl }}/docs/glossary/#admin" class="glossary__link">admin
interface</a>, click on **Users**, then click on the name of the user
you want to lift the request limit for. Click the **Edit** button. Tick
the checkbox **No rate limit**, and click the **Save** button.
@@ -717,12 +717,12 @@ Users can choose which authorities to include in a batch requests. They can eve
</div>
To enable batch requests on your site, first you must set
-<code><a href="{{ site.baseurl }}docs/customising/config/#allow_batch_requests">ALLOW_BATCH_REQUESTS</a></code>
+<code><a href="{{ page.baseurl }}/docs/customising/config/#allow_batch_requests">ALLOW_BATCH_REQUESTS</a></code>
to <code>true</code> in <code>general.yml</code>.
This does not allow anyone to make batch requests yet. You must still
enable this for each user on an individual basis. To do this, go to the
-<a href="{{ site.baseurl }}docs/glossary/#admin"
+<a href="{{ page.baseurl }}/docs/glossary/#admin"
class="glossary__link">admin interface</a>, click on **Users**, then
click on the name of the user who wants to make batch requests. Click
the **Edit** button. Tick the checkbox **Can make batch requests**, and
@@ -741,18 +741,18 @@ an existing request to that authority to the new email address. Alternatively,
a user may send a request to the wrong authority. In that situation, you can
change the authority on the request and then resend it to the correct authority.
For instructions, see
-[resending a request or sending it to a different authority]({{ site.baseurl }}docs/running/requests/#resending-a-request-or-sending-it-to-a-different-authority).
+[resending a request or sending it to a different authority]({{ page.baseurl }}/docs/running/requests/#resending-a-request-or-sending-it-to-a-different-authority).
### Hiding a request
If a request contains vexatious or inappropriate content, is libellous, or is
not a valid
-<a href="{{ site.baseurl }}docs/glossary/#foi" class="glossary__link">Freedom of Information</a>
+<a href="{{ page.baseurl }}/docs/glossary/#foi" class="glossary__link">Freedom of Information</a>
request at all, you may want to hide it. A hidden request is still visible to
you and the other administrators, and (optionally) the requester themselves.
For instructions, see
-[hiding a request]({{ site.baseurl }}docs/running/requests/#hiding-a-request).
+[hiding a request]({{ page.baseurl }}/docs/running/requests/#hiding-a-request).
Responses to a hidden request will be accepted in the normal way, but because
they are added to the request's page, they too will be hidden.
@@ -760,7 +760,7 @@ they are added to the request's page, they too will be hidden.
### Deleting a request
You can delete a request from the site. For instructions, see
-[deleting a request]({{ site.baseurl }}docs/running/requests/#deleting-a-request).
+[deleting a request]({{ page.baseurl }}/docs/running/requests/#deleting-a-request).
Responses to a deleted request will be sent to the holding pen.
diff --git a/docs/running/categories_and_tags.md b/docs/running/categories_and_tags.md
index 8f36ae472..e1192f84d 100644
--- a/docs/running/categories_and_tags.md
+++ b/docs/running/categories_and_tags.md
@@ -8,12 +8,12 @@ title: Categories & tags
<p class="lead">
Use tags to arrange
- <a href="{{ site.baseurl }}docs/glossary/#authority"
+ <a href="{{ page.baseurl }}/docs/glossary/#authority"
class="glossary__link">authorities</a> into categories, or to associate
related authorities with each other. This helps your users find the right
authority for the
- <a href="{{ site.baseurl }}docs/glossary/#request" class="glossary__link">request</a>
- (or <a href="{{ site.baseurl }}docs/glossary/#response" class="glossary__link">response</a>)
+ <a href="{{ page.baseurl }}/docs/glossary/#request" class="glossary__link">request</a>
+ (or <a href="{{ page.baseurl }}/docs/glossary/#response" class="glossary__link">response</a>)
they are interested in.
</p>
@@ -26,7 +26,7 @@ Admin interface introduced in Alaveteli version 0.20
Alaveteli lets you organise your authorities into *categories*. Categories can
themselves belong to *category headings*. For example, some of the categories
and headings on
-<a href="{{ site.baseurl }}docs/glossary/#wdtk" class="glossary__link">WhatDoTheyKnow</a>'s
+<a href="{{ page.baseurl }}/docs/glossary/#wdtk" class="glossary__link">WhatDoTheyKnow</a>'s
<a href="https://www.whatdotheyknow.com/body/list/all">View authorities</a> page look like this:
> * **Media and culture**
@@ -57,7 +57,7 @@ users find the specific authorities they are looking for.
Try to use simple but descriptive words for tags. Tags cannot contain spaces
(use an underscore if you need to, <code>like_this</code>).
Remember that tags will be seen and used by the public (for example, in the
- <a href="{{ site.baseurl }}docs/glossary/#advanced-search" class="glossary__link">advanced search</a>).
+ <a href="{{ page.baseurl }}/docs/glossary/#advanced-search" class="glossary__link">advanced search</a>).
</div>
### Adding a new category
@@ -113,7 +113,7 @@ of these tags.
<td>
This is a test/dummy authority. It is not displayed to the public on your
main site, and it is not included when you
- <a href="{{ site.baseurl }}docs/running/admin_manual/#creating-changing-and-uploading-public-authority-data">export authorities in CSV format</a>.
+ <a href="{{ page.baseurl }}/docs/running/admin_manual/#creating-changing-and-uploading-public-authority-data">export authorities in CSV format</a>.
</td>
</tr>
<tr>
@@ -130,7 +130,7 @@ of these tags.
<code>not_apply</code>
</td>
<td>
- <a href="{{ site.baseurl }}docs/glossary/#foi" class="glossary__link">Freedom of Information</a>
+ <a href="{{ page.baseurl }}/docs/glossary/#foi" class="glossary__link">Freedom of Information</a>
law does not apply to this authority: new requests cannot be sent to an
authority with this tag.
</td>
@@ -142,7 +142,7 @@ of these tags.
<td>
<em>Custom example:</em> (see below)<br>
On our UK installation of Alaveteli,
- <a href="{{ site.baseurl }}docs/glossary/#wdtk" class="glossary__link">WhatDoTheyKnow</a>,
+ <a href="{{ page.baseurl }}/docs/glossary/#wdtk" class="glossary__link">WhatDoTheyKnow</a>,
this tag indicates that the authority is subject to an alternative law
(Environment Information Regulations, rather than the Freedom of
Information), which means Alaveteli must change the wording of these
@@ -155,7 +155,7 @@ of these tags.
</td>
<td>
<em>Custom example:</em> (see below)<br>
- <a href="{{ site.baseurl }}docs/glossary/#wdtk" class="glossary__link">WhatDoTheyKnow</a>
+ <a href="{{ page.baseurl }}/docs/glossary/#wdtk" class="glossary__link">WhatDoTheyKnow</a>
applies a different definition of "late" if an authority has the <code>school</code> tag.
</td>
</tr>
@@ -169,10 +169,10 @@ categories.
If you are a developer, and you want to add special behaviour to your site
based on your own tags, you need to add custom code, which should probably go
in your own
-<a href="{{ site.baseurl}}docs/glossary/#theme" class="glossary__link">theme</a>.
+<a href="{{ page.baseurl }}/docs/glossary/#theme" class="glossary__link">theme</a>.
For example, in the UK, schools are granted special concession in the law to allow for
requests that are made out of term-time. Alaveteli handles this by using the
-[`SPECIAL_REPLY_VERY_LATE_AFTER_DAYS`]({{ site.baseurl }}docs/customising/config/#special_reply_very_late_after_days)
+[`SPECIAL_REPLY_VERY_LATE_AFTER_DAYS`]({{ page.baseurl }}/docs/customising/config/#special_reply_very_late_after_days)
config value if the authority has the `school` tag.
See
[`is_school?`](https://github.com/mysociety/alaveteli/blob/f0bbeb4abf4bf07e5cfb46668f39bbff72ed7210/app/models/public_body.rb#L391)
@@ -183,7 +183,7 @@ for the source code.
## Searching with tags
Alaveteli's
-<a href="{{ site.baseurl }}docs/glossary/#advanced-search" class="glossary__link">advanced search</a>
+<a href="{{ page.baseurl }}/docs/glossary/#advanced-search" class="glossary__link">advanced search</a>
feature (which is available to all your users) can search for specific tags. So
if you add useful tags and publicise them, your users can use them to find
related authorities. For example, see the <a
@@ -191,7 +191,7 @@ href="https://www.whatdotheyknow.com/advancedsearch">advanced search on
WhatDoTheyKnow</a> to see this at work.
You can add reference numbers or specific values to tags using a colon. On
-<a href="{{ site.baseurl }}docs/glossary/#wdtk" class="glossary__link">WhatDoTheyKnow</a>
+<a href="{{ page.baseurl }}/docs/glossary/#wdtk" class="glossary__link">WhatDoTheyKnow</a>
we tag all authorities that are charities with the tag `charity:123456` (where
123456 is the authority's registered charity number).
diff --git a/docs/running/holding_pen.md b/docs/running/holding_pen.md
index 5b7f08bec..535c17dd8 100644
--- a/docs/running/holding_pen.md
+++ b/docs/running/holding_pen.md
@@ -8,15 +8,15 @@ title: The holding pen
<p class="lead">
The <em>holding pen</em> is where Alaveteli puts any incoming
- <a href="{{ site.baseurl }}docs/glossary/#response" class="glossary__link">responses</a>
+ <a href="{{ page.baseurl }}/docs/glossary/#response" class="glossary__link">responses</a>
that can't be matched to a
- <a href="{{ site.baseurl }}docs/glossary/#request" class="glossary__link">request</a>
+ <a href="{{ page.baseurl }}/docs/glossary/#request" class="glossary__link">request</a>
automatically.
</p>
Alaveteli works by emailing requests to the correct target
-<a href="{{ site.baseurl }}docs/glossary/#authority" class="glossary__link">authority</a>.
+<a href="{{ page.baseurl }}/docs/glossary/#authority" class="glossary__link">authority</a>.
That email message is sent from a unique email address &mdash; that is, an
email address that is associated with that single request (technically,
Alaveteli hashes the request ID to generate a unique address and uses this as
@@ -25,7 +25,7 @@ the `Reply-to:` address).
So whenever an authority replies (by email) to a request that Alaveteli has
sent, that response will be addressed to that request's unique email address.
The email is received by your installation's
-<a href="{{ site.baseurl}}docs/glossary/#mta" class="glossary__link">MTA</a>,
+<a href="{{ page.baseurl }}/docs/glossary/#mta" class="glossary__link">MTA</a>,
and is passed on to Alaveteli. In this way, incoming messages are easily
matched with the request they are responses to &mdash; this is important
because your site displays the responses underneath their original request, on
@@ -34,11 +34,11 @@ the request's page.
Normally, this works fine. But sometimes things go wrong, and a message comes
in that can't be matched with a request. When this happens, Alaveteli puts the
message in the
-<a href="{{ site.baseurl }}docs/glossary/#holding_pen" class="glossary__link">holding
+<a href="{{ page.baseurl }}/docs/glossary/#holding_pen" class="glossary__link">holding
pen </a>.
Messages wait in the holding pen until an
-<a href="{{ site.baseurl }}docs/glossary/#super" class="glossary__link">administrator</a>
+<a href="{{ page.baseurl }}/docs/glossary/#super" class="glossary__link">administrator</a>
redelivers them to the correct request, or else deletes them.
## Why messages end up in the holding pen
@@ -61,7 +61,7 @@ There are several reasons why a message might end up in the holding pen:
deliberate attempt to send spam.
* **the response is to a request that has been deleted**<br>
- If you [delete a request]({{ site.baseurl }}docs/running/requests/#deleting-a-request),
+ If you [delete a request]({{ page.baseurl }}/docs/running/requests/#deleting-a-request),
Alaveteli cannot deliver responses to it.
* **the response has been rejected and rejections are set to go to the holding pen**<br>
@@ -72,12 +72,12 @@ There are several reasons why a message might end up in the holding pen:
reasons &mdash; for example, if a response is sent from an unrecognised
email address for a request whose *Allow new responses from* setting is
`authority_only`. See instructions on
- [how to manage requests]({{site.baseurl}}docs/running/requests/) for details.
+ [how to manage requests]({{ page.baseurl }}/docs/running/requests/) for details.
## What to do: redeliver or delete
You need to be an
-<a href="{{ site.baseurl }}docs/glossary/#super" class="glossary__link">administrator</a>
+<a href="{{ page.baseurl }}/docs/glossary/#super" class="glossary__link">administrator</a>
to modify the holding pen.
There are two things you can do to a message in the holding pen:
@@ -90,12 +90,12 @@ There are two things you can do to a message in the holding pen:
If the message is not a response, you can delete it.
For instructions, see
-[removing a message from the holding pen]({{ site.baseurl }}docs/running/admin_manual/#removing-a-message-from-the-holding-pen).
+[removing a message from the holding pen]({{ page.baseurl }}/docs/running/admin_manual/#removing-a-message-from-the-holding-pen).
If the `To:` address does not belong to a valid request and the message is
clearly spam you can add that email address to Alaveteli's
-<a href="{{site.baseurl}}#spam-address-list" class="glossary__link">spam address list</a>.
+<a href="{{ page.baseurl }}/#spam-address-list" class="glossary__link">spam address list</a>.
Subsequent messages to that address will be automatically rejected &mdash; for
instructions see
-[rejecting spam that arrives in the holding pen]({{ site.baseurl }}docs/running/admin_manual/#rejecting-spam-that-arrives-in-the-holding-pen).
+[rejecting spam that arrives in the holding pen]({{ page.baseurl }}/docs/running/admin_manual/#rejecting-spam-that-arrives-in-the-holding-pen).
diff --git a/docs/running/requests.md b/docs/running/requests.md
index e554fe763..3b4c6e44e 100644
--- a/docs/running/requests.md
+++ b/docs/running/requests.md
@@ -8,17 +8,17 @@ title: Managing requests
<p class="lead">
Alaveteli makes it easy for a user to make a
- <a href="{{ site.baseurl }}docs/glossary/#request" class="glossary__link">request</a>.
+ <a href="{{ page.baseurl }}/docs/glossary/#request" class="glossary__link">request</a>.
As an
- <a href="{{ site.baseurl }}docs/glossary/#super" class="glossary__link">administrator</a>,
+ <a href="{{ page.baseurl }}/docs/glossary/#super" class="glossary__link">administrator</a>,
there are some things about that request you can change once it&rsquo;s been created.
</p>
A request is automatically created when a user submits and (where necessary)
confirms it. Alaveteli sends it to the
-<a href="{{ site.baseurl }}docs/glossary/#authority" class="glossary__link">authority</a>
+<a href="{{ page.baseurl }}/docs/glossary/#authority" class="glossary__link">authority</a>
responsible and handles any
-<a href="{{ site.baseurl }}docs/glossary/#response" class="glossary__link">responses</a>.
+<a href="{{ page.baseurl }}/docs/glossary/#response" class="glossary__link">responses</a>.
Usually this process runs without needing any intervention from an
administrator. But sometimes you'll want to change some aspect of the request,
or the way Alaveteli is handling it.
@@ -35,7 +35,7 @@ or the way Alaveteli is handling it.
## What state is the request in?
Every request moves through a series of
-<a href="{{ site.baseurl }}docs/glossary/#state" class="glossary__link">states</a>,
+<a href="{{ page.baseurl }}/docs/glossary/#state" class="glossary__link">states</a>,
indicating its progress. Usually a new request will be in the
`waiting_response` state until something happens to change that &mdash; for
example, a response is received.
@@ -87,7 +87,7 @@ for how to change these settings.
## Changing things about a request
To change any of these settings, go to the
-<a href="{{ site.baseurl }}docs/glossary/#admin" class="glossary__link">admin interface</a>,
+<a href="{{ page.baseurl }}/docs/glossary/#admin" class="glossary__link">admin interface</a>,
click on **Requests**, then click on the title of the request you want to affect.
Click the **Edit metadata** button.
@@ -179,12 +179,12 @@ Click the **Edit metadata** button.
</li>
<li>
<code>holding pen</code>: responses are put in the
- <a href="{{ site.baseurl }}docs/glossary/#holding_pen" class="glossary__link">holding pen</a>
+ <a href="{{ page.baseurl }}/docs/glossary/#holding_pen" class="glossary__link">holding pen</a>
for an administrator to deal with
</li>
<li>
<code>blackhole</code>: responses are destroyed by being sent to a
- <a href="{{ site.baseurl }}docs/glossary/#blackhole" class="glossary__link">black hole</a>
+ <a href="{{ page.baseurl }}/docs/glossary/#blackhole" class="glossary__link">black hole</a>
</li>
</ul>
</td>
@@ -194,7 +194,7 @@ Click the **Edit metadata** button.
What state is it in?
</td>
<td>
- See <a href="{{ site.baseurl }}docs/customising/states/">more about
+ See <a href="{{ page.baseurl }}/docs/customising/states/">more about
request states</a>, which can be customised for your installation.
<p>
You can force the state of the request by choosing it explicitly.
@@ -240,10 +240,10 @@ Click the **Edit metadata** button.
</p>
<p>
Although it&rsquo;s a little more complex than tags on requests,
- <a href="{{ site.baseurl }}docs/glossary/#category" class="glossary__link">categories</a>
+ <a href="{{ page.baseurl }}/docs/glossary/#category" class="glossary__link">categories</a>
also use tags:
see
- <a href="{{ site.baseurl }}docs/running/categories_and_tags/">more about tags</a>
+ <a href="{{ page.baseurl }}/docs/running/categories_and_tags/">more about tags</a>
for a little more information.
</p>
</td>
@@ -258,12 +258,12 @@ a user may send a request to the wrong authority. In that situation, you can
change the authority on the request and then resend it to the correct authority.
To resend a request, go to
-the <a href="{{ site.baseurl }}docs/glossary/#admin"
+the <a href="{{ page.baseurl }}/docs/glossary/#admin"
class="glossary__link">admin interface</a>, click on **Requests**, then
click on the name of the request you want to change. Go to the **Outgoing messages** heading. Click the chevron next to the first outgoing message, which is the initial request. A panel of information about that message will appear. Click on the **Resend** button.
To send a request to a different authority, go to
-the <a href="{{ site.baseurl }}docs/glossary/#admin"
+the <a href="{{ page.baseurl }}/docs/glossary/#admin"
class="glossary__link">admin interface</a>, click on **Requests**, then
click on the name of the request you want to change. In the **Request
metadata** section, there is a line which shows the authority. Click the
@@ -285,7 +285,7 @@ You can hide an entire request. Typically you do this if it's not a valid
Freedom of Information request (for example, a request for personal
information), or if it is vexatious.
-Go to the <a href="{{ site.baseurl }}docs/glossary/#admin" class="glossary__link">admin interface</a>,
+Go to the <a href="{{ page.baseurl }}/docs/glossary/#admin" class="glossary__link">admin interface</a>,
click on **Requests**, then click on the title of the request you want. You can
hide it in one of two ways:
@@ -344,12 +344,12 @@ destroyed as well.
<a href="#hiding-a-request">hide the request</a> instead.
</div>
-Go to the <a href="{{ site.baseurl }}docs/glossary/#admin" class="glossary__link">admin interface</a>,
+Go to the <a href="{{ page.baseurl }}/docs/glossary/#admin" class="glossary__link">admin interface</a>,
click on **Requests**, then click on the title of the request you want to delete.
Click the **Edit metadata** button. Click on the red **Destroy request entirely**
button at the bottom of the page.
Responses to a deleted request will be sent to the
-<a href="{{ site.baseurl }}docs/glossary/#holding_pen" class="glossary__link">holding pen</a>.
+<a href="{{ page.baseurl }}/docs/glossary/#holding_pen" class="glossary__link">holding pen</a>.
diff --git a/docs/running/upgrading.md b/docs/running/upgrading.md
index 88aeb7b2d..39c18163c 100644
--- a/docs/running/upgrading.md
+++ b/docs/running/upgrading.md
@@ -76,7 +76,7 @@ Patch version increases (e.g. 0.1.2.3 &rarr; 0.1.2.**4**) should not require any
Minor version increases (e.g. 0.1.2.4 &rarr; 0.1.**3**.0) will usually require further action. You should read the [`CHANGES.md`](https://github.com/mysociety/alaveteli/blob/master/doc/CHANGES.md) document to see what's changed since your last deployment, paying special attention to anything in the "Upgrade notes" sections.
Any upgrade may include new translations strings, that is, new or altered messages
-to the user that need translating to your locale. You should visit <a href="{{ site.baseurl }}docs/glossary/#transifex" class="glossary__link">Transifex</a>
+to the user that need translating to your locale. You should visit <a href="{{ page.baseurl }}/docs/glossary/#transifex" class="glossary__link">Transifex</a>
and try to get your translation up to 100% on each new release. Failure to do
so means that any new words added to the Alaveteli source code will appear in
your website in English by default. If your translations didn't make it to the