Merge branch 'master' of gitlab.doc.ic.ac.uk:resource-reasoning/psvg.doc.ic.ac.uk

.htaccess

 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

403.md

+---
+layout: page
+title: "Error 403: Page Not Found"
+permalink: /403.html
+---
+
+Oops :(. This page is not verified, therefore clients should not access it.

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

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

blurbs.txt

-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

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 %}

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 %}

publications.html

@@ -3,5 +3,7 @@ title: Publications
 menu: true
 layout: toc
 menu_order: 6
+permalink: /publications/
+redirect_from: /publications.html
 ---
 {% bibliography -g year %}

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.

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/