aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/customising/config.md10
-rw-r--r--docs/customising/index.md10
-rw-r--r--docs/customising/themes.md6
-rw-r--r--docs/developers/directory_structure.md4
-rw-r--r--docs/developers/index.md10
-rw-r--r--docs/developers/overview.md2
-rw-r--r--docs/getting_started.md15
-rw-r--r--docs/glossary.md25
-rw-r--r--docs/index.md16
-rw-r--r--docs/installing/ami.md2
-rw-r--r--docs/installing/index.md10
-rw-r--r--docs/installing/macos.md2
-rw-r--r--docs/installing/manual_install.md10
-rw-r--r--docs/installing/script.md2
-rw-r--r--docs/running/admin_manual.md6
-rw-r--r--docs/running/index.md6
-rw-r--r--docs/running/server.md8
-rw-r--r--docs/running/states.md4
-rw-r--r--docs/running/states_informatazyrtare.md4
-rw-r--r--docs/running/upgrading.md7
20 files changed, 80 insertions, 79 deletions
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..1a253d43f 100644
--- a/docs/customising/themes.md
+++ b/docs/customising/themes.md
@@ -13,7 +13,7 @@ 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**.
@@ -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/developers/directory_structure.md b/docs/developers/directory_structure.md
index e073a96ce..5d0d55642 100644
--- a/docs/developers/directory_structure.md
+++ b/docs/developers/directory_structure.md
@@ -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..f8367a4ea 100644
--- a/docs/developers/index.md
+++ b/docs/developers/index.md
@@ -16,10 +16,10 @@ title: For developers
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,10 @@ 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
+ past](https://www.mysociety.org/2009/09/17/whatdotheyknow-growing-pains-and-rub
y-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 ca2d27985..8193528ce 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 }}images/railsmodels.png"><img src="{{ site.baseurl }}images/railsmodels.png"></a>
+<a name="schema-diagram" 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 c51847b69..2c0236b0d 100644
--- a/docs/getting_started.md
+++ b/docs/getting_started.md
@@ -28,7 +28,7 @@ available time.
You can get a feeling for how things might turn out by reading [how an
Alaveteli was set up in
-Spain](http://www.alaveteli.org/2012/04/a-right-to-know-site-for-spain/)
+Spain]({{ site.baseurl }}2012/04/16/a-right-to-know-site-for-spain/)
(remember that this was with an experienced developer in charge). You will also
need to think about how you will run the website; a successful Alaveteli
requires lots of ongoing effort to moderate and publicise (see Step 6 and Step
@@ -98,7 +98,7 @@ third parties, and to do so we're happy to help host low-volume sites for two
or three partners. However, you will have no service level agreement, no
warranties, and no guarantee on our time: if the website goes down when we're
on holiday, you'll have to wait until we're back! If you want to try this
-route, please [get in touch](http://alaveteli.org/contact-us) to find out if
+route, please [get in touch](mailto:international@mysociety.org) to find out if
we have capacity.
### Install your own copy
@@ -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.
@@ -156,7 +156,7 @@ If you email possible supporters asking for help, in addition to helping make
your job easier, it will also help you identify eager people who might be
interested in helping you maintain and run the website. We have written [a
blog post about
-this](http://www.alaveteli.org/2011/07/you-need-volunteers-to-make-your-website-work/).
+this]({{ site.baseurl }}2011/07/29/you-need-volunteers-to-make-your-website-work/).
The admin interface includes a page where you can upload a CSV file (that's a
file containing comma-separated values) to create or edit authorities. CSV is a
@@ -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
@@ -345,8 +345,7 @@ This will be easier to do with a small team of people sharing jobs. Hopefully
you have been lucky enough to get funding to pay people to do these tasks.
However, you are also likely to have to rely on volunteers. We've written [a
blog post about the importance of
-volunteers](http://www.alaveteli.org/2011/07/you-need-volunteers-to-make-your-we
-bsite-work/), which you should read.
+volunteers]({{ site.baseurl }}2011/07/29/you-need-volunteers-to-make-your-website-work/), which you should read.
You'll need to set up a group email address for all the people who will manage
the website. All site user queries will go here, as will automatic
diff --git a/docs/glossary.md b/docs/glossary.md
index 29f307ca6..7733f9889 100644
--- a/docs/glossary.md
+++ b/docs/glossary.md
@@ -49,7 +49,7 @@ 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
@@ -184,7 +184,7 @@ Definitions
<li>
censor rules may simply redact text that exactly matches a
particular sentence or phrase, or may use
- <a href="regexp">regular expressions</a>
+ <a href="#regexp">regular expressions</a>
</li>
</ul>
</div>
@@ -253,12 +253,12 @@ 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>
Everything about git from the <a
- href="//http://git-scm.com">official website</a>.
+ href="http://git-scm.com">official website</a>.
</li>
<li>
See <a href="http://github.com/mysociety">the mySociety projects on
@@ -269,7 +269,7 @@ Definitions
</dd>
<dt>
- <a name="holding pen">holding pen</a>
+ <a name="holding_pen">holding pen</a>
</dt>
<dd>
The <strong>holding pen</strong> is the conceptual place where responses that
@@ -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,8 +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 8cf85e8c2..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?
@@ -17,18 +17,18 @@ You've found the documentation for Alaveteli.
* Learn about the project at [www.alaveteli.org](http://www.alaveteli.org).
-* Read [Turbo Transparency](http://www.alaveteli.org/files/2012/10/Turbo-Transparency-v1.0.pdf), a paper about how and why to use Alaveteli for Freedom of Information systems
+* 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..3f8897b16 100644
--- a/docs/installing/ami.md
+++ b/docs/installing/ami.md
@@ -9,7 +9,7 @@ title: Installing the easy way
We've made an Amazon Machine Image (AMI) so you can quickly deploy on Amazon EC2. This is handy if you just want to evaluate Alaveteli, for example.
</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
diff --git a/docs/installing/index.md b/docs/installing/index.md
index 98efa7b8a..c276c3d08 100644
--- a/docs/installing/index.md
+++ b/docs/installing/index.md
@@ -47,16 +47,16 @@ those servers, because Capistrano takes care of that for you.
## Installing the core code
-* [Install on Amazon EC2]({{ site.baseurl }}docs/installing/ami) using our AMI
-* [Use the installation script]({{ site.baseurl }}docs/installing/script) which does the full installation on your own server
-* [Manual installation]({{ site.baseurl }}docs/installing/manual_install) -- step-by-step instructions
+* [Install on Amazon EC2]({{ site.baseurl }}docs/installing/ami/) using our AMI
+* [Use the installation script]({{ site.baseurl }}docs/installing/script/) which does the full installation on your own server
+* [Manual installation]({{ site.baseurl }}docs/installing/manual_install/) -- step-by-step instructions
If you're setting up a development server on MacOS X, we've also got
-[MacOS installation instructions]({{ site.baseurl }}docs/installing/macos).
+[MacOS installation instructions]({{ site.baseurl }}docs/installing/macos/).
## Other installation information
Alaveteli needs to be able to send and receive email, so you need to setup your
MTA (Mail Transfer Agent) appropriately.
-* [Installing the MTA]({{ site.baseurl }}docs/installing/email)
+* [Installing the MTA]({{ site.baseurl }}docs/installing/email/)
diff --git a/docs/installing/macos.md b/docs/installing/macos.md
index 181057fda..2b6309b89 100644
--- a/docs/installing/macos.md
+++ b/docs/installing/macos.md
@@ -11,7 +11,7 @@ title: Installing on MacOS X
help.
</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
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 bd3a44855..26da3c298 100644
--- a/docs/running/admin_manual.md
+++ b/docs/running/admin_manual.md
@@ -13,7 +13,7 @@ title: Administrator's guide
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
@@ -141,7 +141,7 @@ user of the site who later develops "Google remorse".
material down against the public interest in publishing / continuing to
publish the material. "Sensitive" personal data will typically require a
much higher level of public interest.
-* [WhatDoTheyKnow considers](http://www.whatdotheyknow.com/help/privacy#takedown) there to be a
+* [WhatDoTheyKnow considers](https://www.whatdotheyknow.com/help/privacy#takedown) there to be a
strong public interest in retaining the names of officers or servants of
public authorities
* For users who want their name removed entirely from the site, in the first
@@ -213,7 +213,7 @@ Respond to user and point them in the right direction.
> in public, via our site. To get started click "make a new freedom of
> information request" at:
>
-> http://www.whatdotheyknow.com/body/&lt;authority_name&gt;
+> https://www.whatdotheyknow.com/body/&lt;authority_name&gt;
### Wants advice
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..5a80642ef 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:
@@ -80,7 +80,7 @@ deliverability of your email:
or_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..a64cdda79 100644
--- a/docs/running/states.md
+++ b/docs/running/states.md
@@ -15,7 +15,7 @@ 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
@@ -24,7 +24,7 @@ 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/docs/running/upgrading.md b/docs/running/upgrading.md
index 6088d9ab1..611712bf6 100644
--- a/docs/running/upgrading.md
+++ b/docs/running/upgrading.md
@@ -14,8 +14,11 @@ Upgrading Alaveteli
## Master branch contains the latest stable release
The developer team policy is that the `master` branch in git should always
-contain the latest stable release. Therefore, in production, you should usually
-have your software deployed from the `master` branch.
+contain the latest stable release -- so you'll be up to date if you pull from
+the `master` branch. However, on your
+<a href="{{site.baseurl}}docs/glossary/#production" class="glossary">production site</a>,
+you should know precisely what version you're running, and deploy Alaveteli
+from a [*specific* release tag](https://github.com/mysociety/alaveteli/releases).
Upgrading may just require pulling in the latest code -- but it may also require
other changes ("further action"). For this reason, for anything other than a
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-11 13:37:05 +0000