Merge branch 'master' of git://git.netsurf-browser.org/netsurf-website

10 files changed, 20 insertions, 6 deletions

diff --git a/downloads/amiga/index.en b/downloads/amiga/index.html
index 9b2aa72..7320423 100644
--- a/downloads/amiga/index.en
+++ b/downloads/amiga/index.html
@@ -63,7 +63,7 @@
 <div class="downloadlatestouter">
 <div class="downloadlatest">
 <div class="downloadlatestbox">
-<p class="downloadmain downloadfirst"><a href="http://download.netsurf-browser.org/netsurf/releases/pre-built/amiga/netsurf-3.1.lha"><span>NetSurf 3.1 for AmigaOS</span> <span>(5.9MB)</span> <span class="downloaddate">26 Apr 2014</span></a></p>
+<p class="downloadmain downloadfirst"><a href="http://download.netsurf-browser.org/netsurf/releases/pre-built/amiga/netsurf-3.2.lha"><span>NetSurf 3.2 for AmigaOS</span> <span>(5.9MB)</span> <span class="downloaddate">30 Aug 2014</span></a></p>
 <!--<p class="downloadinstructions"><a href="/documentation/roinfo#GettingStartedInstallation">Installation instructions</a></p>-->
 <p class="preul">Requires:</p>
 <ul>
@@ -72,7 +72,7 @@
 </div>
 
 <div class="downloadlatestbox downloadlast">
-<p class="downloadmain"><a href="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.1-src.tar.gz"><span>NetSurf 3.1 source code</span> <span>(2.9MB)</span> <span class="downloaddate">26 Apr 2014</span></a></p>
+<p class="downloadmain"><a href="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.2-src.tar.gz"><span>NetSurf 3.2 source code</span> <span>(2.9MB)</span> <span class="downloaddate">30 Aug 2014</span></a></p>
 <p class="downloadinstructions"><a href="/downloads/source/#BuildInstructions">Build instructions</a></p>
 <p class="preul">Build NetSurf for:</p>
 <ul>
@@ -90,6 +90,13 @@
 
 <h2>Previous releases</h2>
 <dl>
+<dt>NetSurf 3.1</dt>
+<dd>
+<ul>
+<li><a href="http://download.netsurf-browser.org/netsurf/releases/pre-built/amiga/netsurf-3.1.lha">NetSurf 3.1 browser for AmigaOS 4</a> (26 Apr 2014)</li>
+<li><a href="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.1-src.tar.gz">NetSurf 3.1 source code</a> (26 Apr 2014)</li>
+</ul>
+</dd>
 <dt>NetSurf 2.9</dt>
 <dd>
 <ul>
diff --git a/downloads/atari/index.en b/downloads/atari/index.html
index 24834e8..24834e8 100644
--- a/downloads/atari/index.en
+++ b/downloads/atari/index.html
diff --git a/downloads/beos/index.en b/downloads/beos/index.html
index a52d419..a52d419 100644
--- a/downloads/beos/index.en
+++ b/downloads/beos/index.html
diff --git a/downloads/extras.en b/downloads/extras.html
index d5af4df..dc72ad6 100644
--- a/downloads/extras.en
+++ b/downloads/extras.html
@@ -55,9 +55,8 @@
 
 <p>This page contains additional downloads available for NetSurf users.</p>
 
-<!--#config timefmt="%d %b %Y %R %Z" sizefmt="abbrev"-->
 <ul class="developmentbuilds">
-<li><a href="http://download.netsurf-browser.org/other/nstheme/nstheme.zip">NSTheme 0.02 for RISC&nbsp;OS</a> <span><!--#fsize file="releases/nstheme.zip"--></span> <span><!--#flastmod file="http://download.netsurf-browser.org/other/nstheme/nstheme.zip"--></span></li>
+<li><a href="http://download.netsurf-browser.org/other/nstheme/nstheme.zip">NSTheme 0.02 for RISC&nbsp;OS</a> <span>5.7M</span> <span>2012</span></li>
 </ul>
 
 <p>NSTheme is a theme packager for the RISC OS version of NetSurf. Themes can be installed from the <a href="themes/">themes page</a>.</p>
diff --git a/downloads/gtk/index.en b/downloads/gtk/index.html
index d864f92..d864f92 100644
--- a/downloads/gtk/index.en
+++ b/downloads/gtk/index.html
diff --git a/downloads/index.en b/downloads/index.html
index 369e8cc..369e8cc 100644
--- a/downloads/index.en
+++ b/downloads/index.html
diff --git a/downloads/macosx/index.en b/downloads/macosx/index.html
index 7b714bc..7b714bc 100644
--- a/downloads/macosx/index.en
+++ b/downloads/macosx/index.html
diff --git a/downloads/riscos/index.en b/downloads/riscos/index.html
index 3dd548b..d4e528a 100644
--- a/downloads/riscos/index.en
+++ b/downloads/riscos/index.html
@@ -63,7 +63,7 @@
 <div class="downloadlatestouter">
 <div class="downloadlatest">
 <div class="downloadlatestbox">
-<p class="downloadmain downloadfirst"><a href="http://download.netsurf-browser.org/netsurf/releases/pre-built/riscos/netsurf-3.1.zip"><span>NetSurf 3.1 for RISC&nbsp;OS</span> <span>(3.3MB)</span> <span class="downloaddate">26 Apr 2014</span></a></p>
+<p class="downloadmain downloadfirst"><a href="http://download.netsurf-browser.org/netsurf/releases/pre-built/riscos/netsurf-3.2.zip"><span>NetSurf 3.2 for RISC&nbsp;OS</span> <span>(3.3MB)</span> <span class="downloaddate">30 Aug 2014</span></a></p>
 <p class="downloadinstructions"><a href="/documentation/roinfo#GettingStartedInstallation">Installation instructions</a></p>
 <p class="preul">Binary download includes:</p>
 <ul>
@@ -81,7 +81,7 @@
 </div>
 
 <div class="downloadlatestbox downloadlast">
-<p class="downloadmain"><a href="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.1-src.tar.gz"><span>NetSurf 3.1 source code</span> <span>(2.9MB)</span> <span class="downloaddate">26 Apr 2014</span></a></p>
+<p class="downloadmain"><a href="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.2-src.tar.gz"><span>NetSurf 3.2 source code</span> <span>(2.9MB)</span> <span class="downloaddate">30 Aug 2014</span></a></p>
 <p class="downloadinstructions"><a href="/downloads/source/#BuildInstructions">Build instructions</a></p>
 <p class="preul">Build NetSurf for:</p>
 <ul>
@@ -100,6 +100,13 @@
 
 <h2>Previous releases</h2>
 <dl>
+<dt>NetSurf 3.1</dt>
+<dd>
+<ul>
+<li><a href="http://download.netsurf-browser.org/netsurf/releases/pre-built/riscos/netsurf-3.1.zip">NetSurf 3.1 browser for RISC OS</a> (26 Apr 2014)</li>
+<li><a href="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.1-src.tar.gz">NetSurf 3.1 source code</a> (26 Apr 2014)</li>
+</ul>
+</dd>
 <dt>NetSurf 3.0</dt>
 <dd>
 <ul>
diff --git a/downloads/source/index.en b/downloads/source/index.html
index cc798ba..8519f1f 100644
--- a/downloads/source/index.en
+++ b/downloads/source/index.html
@@ -56,6 +56,7 @@
 <p>The source code for each release version of NetSurf is available.</p>
 
 <ul>
+<li><a href="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-3.2.tar.gz">NetSurf 3.2 source code</a> (30 Aug 2014)</li>
 <li><a href="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-3.1.tar.gz">NetSurf 3.1 source code</a> (26 Apr 2014)</li>
 <li><a href="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-3.0-full-src.tar.gz">NetSurf 3.0 source code</a> (20 Apr 2013)</li>
 <li><a href="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-2.9-full-src.tar.gz">NetSurf 2.9 source code</a> (27 Mar 2012)</li>
diff --git a/downloads/themes/index.en b/downloads/themes/index.html
index a61e9c0..a61e9c0 100644
--- a/downloads/themes/index.en
+++ b/downloads/themes/index.html