diff --git a/.htaccess b/.htaccess
index 64301dbc609485b1697529cbeeef97b999d212a4..21f0b599aaa2ce0e133a14907d6817a083c6dd17 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,4 +1,5 @@
CheckSpelling Off
+Options -Indexes
RewriteEngine on
@@ -15,4 +16,5 @@ RewriteRule ^ca($|/) http://psvg.doc.ic.ac.uk/research/concurrency.html [R=301,L
RewriteCond %{HTTP_HOST} !=psvg.doc.ic.ac.uk
RewriteRule ^(.*)$ http://psvg.doc.ic.ac.uk/$1 [R=301,L]
+ErrorDocument 403 /403.html
ErrorDocument 404 /404.html
diff --git a/403.md b/403.md
new file mode 100644
index 0000000000000000000000000000000000000000..3c3026166302aa91a6e6f447322b6d33dd2cef41
--- /dev/null
+++ b/403.md
@@ -0,0 +1,7 @@
+---
+layout: page
+title: "Error 403: Page Not Found"
+permalink: /403.html
+---
+
+Oops :(. This page is not verified, therefore clients should not access it.
diff --git a/Gemfile b/Gemfile
index 2fbdae6dc13098a4212f80bb8c864768713f5047..5a1aa47e037952f68e2f4e28c3826ee064ce0c29 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,6 +7,7 @@ group :default, :jekyll_plugins do
gem 'jekyll-scholar', '~> 5.9.1'
#gem 'jekyll-scholar', :git => '/home/thomas/jekyll-scholar', :branch => 'master'
gem 'jekyll-sitemap'
+ gem 'jekyll-redirect-from'
end
group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index c1c3375da0835f0c06d6776417d802edd87b19d8..46d87723b76e5426b4a1c2ed296e58ab15405a9e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -48,6 +48,8 @@ GEM
pathutil (~> 0.9)
rouge (~> 1.7)
safe_yaml (~> 1.0)
+ jekyll-redirect-from (0.12.1)
+ jekyll (~> 3.3)
jekyll-sass-converter (1.5.0)
sass (~> 3.4)
jekyll-scholar (5.9.1)
@@ -83,7 +85,7 @@ GEM
public_suffix (2.0.5)
rake (12.0.0)
rb-fsevent (0.9.8)
- rb-inotify (0.9.7)
+ rb-inotify (0.9.8)
ffi (>= 0.5.0)
rouge (1.11.1)
safe_yaml (1.0.4)
@@ -103,6 +105,7 @@ PLATFORMS
DEPENDENCIES
html-proofer (~> 3.0)
jekyll
+ jekyll-redirect-from
jekyll-scholar (~> 5.9.1)
jekyll-sitemap
pry
diff --git a/blurbs.txt b/blurbs.txt
deleted file mode 100644
index 42c7421b1317a66ba4dbc1b3eb50a5d94d4edb6c..0000000000000000000000000000000000000000
--- a/blurbs.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-The world-wide web is a nearly-ubiquitous and continuously-growing application platform.
-As users increasingly come to depend on web applications, it is more important than ever to be able to make guarantees about these programs.
-Yet these applications are built on a melange of technologies that have evolved in response to the demands of developers and users, which present a daunting task for formal analysis.
-
-The purpose of the Reliable Web group is to develop formal techniques for making guarantees about web applications.
-Particular successes include formalising the semantics of JavaScript, the dynamic language that underpins client-side web applications, and developing local reasoning about the W3C Document Object Model, the data model that web applications use to represent and manipulate web documents.
\ No newline at end of file
diff --git a/news.html b/news.html
index 0d916975f813a8a583eefab05ef34e77310aa7c5..b1740817aae94a7618e38051b5a0c6347dffea66 100644
--- a/news.html
+++ b/news.html
@@ -3,5 +3,7 @@ title: News
menu: true
menu_order: 2
layout: page
+permalink: /news/
+redirect_from: /news.html
---
{% include news-page.html posts=site.posts %}
diff --git a/people.html b/people.html
index f85c8eb3bc14df847b425aa16423fc10ed23d483..e57d16d144aafc61381ba3c4b9e10626373f1556 100644
--- a/people.html
+++ b/people.html
@@ -2,5 +2,7 @@
title: People
menu: true
menu_order: 3
+permalink: /people/
+redirect_from: /people.html
---
{% include person-cards.html people=site.people %}
diff --git a/publications.html b/publications.html
index 76be1c0de0396bae611cdff3c74d228d63765d29..9a8cf97b35d831a13215fe0b092b2bc73e8cd5fe 100644
--- a/publications.html
+++ b/publications.html
@@ -3,5 +3,7 @@ title: Publications
menu: true
layout: toc
menu_order: 6
+permalink: /publications/
+redirect_from: /publications.html
---
{% bibliography -g year %}
diff --git a/research/concurrency.md b/research/concurrency.md
index 722c57c58baf85984d3a15be1d6aac10e6030d77..af9fb659913d3c8f6dcf36256f3c767d5c558a3d 100644
--- a/research/concurrency.md
+++ b/research/concurrency.md
@@ -27,7 +27,7 @@ logics, and applying our work to real-world concurrent programs.
This research is supported by the EPSRC programme grant
[EP/K008528/1]: [REMS: Rigorous Engineering of Mainstream
-Systems][REMS] and the EPSRC programme grant [EP/H008373/2]: [Resource
+Systems][REMS] and previously by the EPSRC programme grant [EP/H008373/2]: [Resource
Reasoning]. We also have substantial collaboration with [Thomas Dinsdale-Young],
previously a PhD student and RA of Gardner and now an independent
research fellow at the University of Aarhus.
diff --git a/research/javascript.md b/research/javascript.md
index 28b50057b951e3b02280c90df926fe9590722007..951d7cbded375e8f2bad10ffb119ced557d1c083 100644
--- a/research/javascript.md
+++ b/research/javascript.md
@@ -40,13 +40,18 @@ JSIL to develop front-ends for the CBMC and Infer verification tools.
#### Research Support
This research is supported by the EPSRC/GCHQ grant [EP/K032089/1]:
-[Certified Verification of Client-Side Web Programs][1] and the EPSRC
-programme grant [EP/H008373/2]: [Resource Reasoning]. We also
-interact extensively with [Arthur Charguéraud], [Alan Schmitt] and
+[Certified Verification of Client-Side Web Programs][1], the EPSRC
+programme grant [EP/K008528/1]: [REMS: Rigorous Engineering of
+Mainstream Systems][REMS] and previously by the EPSRC
+programme grant [EP/H008373/2]: [Resource Reasoning].
+
+We also interact extensively with [Arthur Charguéraud], [Alan Schmitt] and
[Martin Bodin] of INRIA, who are supported by the [AJACS] project.
[EP/K032089/1]: http://gow.epsrc.ac.uk/NGBOViewGrant.aspx?GrantRef=EP/K032089/1
[EP/H008373/2]: http://gow.epsrc.ac.uk/NGBOViewGrant.aspx?GrantRef=EP/H008373/2
+[EP/K008528/1]: http://gow.epsrc.ac.uk/NGBOViewGrant.aspx?GrantRef=EP/K008528/1
+[REMS]: http://www.cl.cam.ac.uk/~pes20/rems/
[1]: https://verificationinstitute.org/project/certified-verification-of-client-side-web-programs/
[Resource Reasoning]: http://www.resourcereasoning.com/
[Arthur Charguéraud]: http://www.chargueraud.org/