Replace site.baseurl with page.baseurl

Content URLs need page.baseurl to include the current locale

5 files changed, 62 insertions, 62 deletions

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