improve downloads pages

improve main downloads page explanation text
GTK toolkit page uses gtk icon and lists flathub links
Haiku toolkit page updated to point at the haiku depot

4 files changed, 126 insertions, 116 deletions

diff --git a/downloads/beos/index.html b/downloads/beos/index.html
index 2fe1211..9f6cd72 100644
--- a/downloads/beos/index.html
+++ b/downloads/beos/index.html
@@ -61,31 +61,28 @@
 </dl>
 </div>
 
-<div class="downloadlatestouter">
-<div class="downloadlatest">
-<div class="downloadlatestbox">
-<p class="downloadmain downloadfirst"><a href="http://download.netsurf-browser.org/netsurf/releases/pre-built/beos/3.8-netsurf"><span>NetSurf 3.8 for Haiku</span> <span>(11MB)</span> <span class="downloaddate">29 Aug 2018</span></a></p>
-<p class="downloadinstructions">Extract to boot and create symlink for Deskbar</p>
-<!--<p class="preul">Requires:</p>
-<ul>
-<li>Haiku</li>
-</ul>-->
-</div>
+<p>The current port for BeOS Haiku is incomplete but functional. Prebuilt editions are only available for Haiku from their depot Server.</p>
 
-<div class="downloadlatestbox downloadlast">
-<p class="downloadmain"><a href="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.8-src.tar.gz"><span>NetSurf 3.8 source code</span> <span>(3.9MB)</span> <span class="downloaddate">29 Aug 2018</span></a></p>
-<p class="downloadinstructions"><a href="/downloads/source/#BuildInstructions">Build instructions</a></p>
-<p class="preul">Build NetSurf for:</p>
-<ul>
-<li>Haiku</li>
-<li>BeOS</li>
-<li>Linux</li>
-<li>Free/NetBSD</li>
-<li>And more</li>
-</ul>
-</div>
-</div>
-<div class="arrow"></div>
+<div class="downloadlatestouter">
+  <div class="downloadlatest">
+    <div class="downloadlatestbox">
+      <p class="downloadmain downloadfirst"><a href="https://depot.haiku-os.org/#!/pkg/netsurf"><span>NetSurf 3.10 for Haiku</span> <span>(4.6MB)</span> <span class="downloaddate">29 Aug 2018</span></a></p>
+    </div>
+
+    <div class="downloadlatestbox downloadlast">
+      <p class="downloadmain"><a href="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-3.10.tar.gz"><span>NetSurf 3.10 source code</span> <span>(8.5MB)</span> <span class="downloaddate">24 May 2020</span></a></p>
+      <p class="downloadinstructions"><a href="/downloads/source/#BuildInstructions">Build instructions</a></p>
+      <p class="preul">Build NetSurf for:</p>
+      <ul>
+	<li>Haiku</li>
+	<li>BeOS</li>
+	<li>Linux</li>
+	<li>Free/NetBSD</li>
+	<li>And more</li>
+      </ul>
+    </div>
+  </div>
+  <div class="arrow"></div>
 </div>
 
 <p>Check out the <a href="http://download.netsurf-browser.org/netsurf/releases/ChangeLog.txt">change log</a> to see what's changed since the last release.</p>
@@ -94,10 +91,27 @@
 
 <h2>Previous releases</h2>
 <dl>
+<dt>NetSurf 3.9</dt>
+<dd>
+<ul>
+<li><a href="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.9-src.tar.gz">NetSurf 3.9 source code</a> (18 Jul 2019)</li>
+</ul>
+</dd>
+<dt>NetSurf 3.8</dt>
+<dd>
+<ul>
+<li><a href="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.8-src.tar.gz">NetSurf 3.8 source code</a> (29 Aug 2018)</li>
+</ul>
+</dd>
+<dt>NetSurf 3.7</dt>
+<dd>
+<ul>
+<li><a href="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.7-src.tar.gz">NetSurf 3.7 source code</a> (20 Oct 2017)</li>
+</ul>
+</dd>
 <dt>NetSurf 3.6</dt>
 <dd>
 <ul>
-<li><a href="http://download.netsurf-browser.org/netsurf/releases/pre-built/beos/3.6-netsurf">NetSurf 3.6 browser for Haiku</a> (19 Nov 2016)</li>
 <li><a href="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.6-src.tar.gz">NetSurf 3.6 source code</a> (19 Nov 2016)</li>
 </ul>
 </dd>
@@ -116,7 +130,7 @@
 
 
 <div class="footer">
-<p>Copyright 2003 - 2009 The NetSurf Developers</p>
+<p>Copyright 2003 - 2020 The NetSurf Developers</p>
 </div>
 
 </div>
diff --git a/downloads/gtk/index.html b/downloads/gtk/index.html
index e7579d5..337c243 100644
--- a/downloads/gtk/index.html
+++ b/downloads/gtk/index.html
@@ -61,67 +61,55 @@
 </dl>
 </div>
 
-<p>NetSurf's GTK front end works on systems that provive a Unix-like environment, such as Linux, FreeBSD, NetBSD, Solaris and others. If your distribution packages NetSurf, you can use that. Otherwise you can download and build the source code.</p>
+<p>The Netsurf <a href="https://www.gtk.org/">GTK toolkit</a> front
+end is targeted at systems that provive a Unix-like environment, such
+as Linux, OpenBSD, FreeBSD, NetBSD, Solaris and similar.</p>
 
-<div class="downloadlatestouter">
-<div class="downloadlatest">
-<div class="downloadlatestbox downloadlast">
-<p class="downloadmain downloadfirst"><a href="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-3.10.tar.gz"><span>NetSurf 3.10 source code</span> <span>(8.0MB)</span> <span class="downloaddate">24 May 2020</span></a></p>
-<p class="downloadinstructions"><a href="/downloads/source/#BuildInstructions">Build instructions</a></p>
-<p class="preul">Build NetSurf for:</p>
-<ul>
-<li>Linux</li>
-<li>Free/NetBSD</li>
-<li>Solaris</li>
-<li>RISC OS</li>
-<li>And more</li>
-</ul>
-</div>
-</div>
-<div class="arrow"></div>
-</div>
+<p>By default GTK version 3 is used but version 2 can be used if desired.</p>
 
-<p>Check out the <a href="http://download.netsurf-browser.org/netsurf/releases/ChangeLog.txt">change log</a> to see what's changed since the last release.</p>
+<p>Some operating systems include NetSurf such as 
+<a href="https://tracker.debian.org/pkg/netsurf">Debian packages</a>
+and <a href="https://openports.se/www/netsurf/browser">OpenBSD
+ports</a>. If these are up to date then they are probably the best to
+use.</p>
 
-<h2>Packages</h2>
-<p>We provide packages for installation of NetSurf releases on various systems.</p>
+<p>A <a href="https://github.com/flathub/org.netsurf_browser.NetSurf">flatpak</a> is available.</p>
 
-<dl class="packagelist">
-<dt>NetSurf 2.7</dt>
-<dd>
-<ul>
-<li><a href="http://download.netsurf-browser.org/netsurf/releases/pre-built/debian/squeeze/netsurf-gtk_2.7-2_amd64.deb">Debian Squeeze AMD64 package</a></li>
-</ul>
-</dd>
-</dl>
+<p>If none of these options are suitable a build from source will be necessary.</p>
 
-<!--h2>Externally Hosted Packages</h2>
+<div class="downloadlatestouter">
+  <div class="downloadlatest">
+    <div class="downloadlatestbox downloadlast">
+      <p class="downloadmain downloadfirst"><a href="https://flathub.org/apps/details/org.netsurf_browser.NetSurf"><span>NetSurf on Flathub</span></a> <a href="https://flathub.org/repo/appstream/org.netsurf_browser.NetSurf.flatpakref"><span>Install</span></a> <span class="downloaddate">24 May 2020</span></p>
+      <p class="preul">Some of the distributions available for <a href="https://flatpak.org/setup/">flatpak</a>:</p>
+      <ul>
+	<li>Ubuntu</li>
+	<li>Fedora</li>
+	<li>Endless</li>
+	<li>ChromeOS</li>
+	<li>Redhat</li>
+      </ul>
+    </div>
+  </div>
 
-<p>NetSurf is available in some distributions' package repositories.</p>
+    <div class="downloadlatestbox downloadlast">
+      <p class="downloadmain"><a href="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-3.10.tar.gz"><span>NetSurf 3.10 source code</span> <span>(8.5MB)</span> <span class="downloaddate">24 May 2020</span></a></p>
+      <p class="downloadinstructions"><a href="/downloads/source/#BuildInstructions">Build instructions</a></p>
+      <p class="preul">Build NetSurf for:</p>
+      <ul>
+	<li>Linux</li>
+	<li>Free/NetBSD</li>
+	<li>Solaris</li>
+	<li>RISC OS</li>
+	<li>And more</li>
+      </ul>
+    </div>
+  </div>  
+  <div class="arrow"></div>
+</div>
+
+<p>Check out the <a href="http://download.netsurf-browser.org/netsurf/releases/ChangeLog.txt">change log</a> to see what's changed since the last release.</p>
 
-<dl>
-<dt>Debian</dt>
-<dd><ul>
-<li><a href="http://packages.debian.org/lenny/netsurf">Debian Lenny</a></li>
-<li><a href="http://packages.debian.org/sid/netsurf">Debian Sid</a></li>
-</ul></dd>
-<dt>Ubuntu</dt>
-<dd><ul>
-<li><a href="https://launchpad.net/ubuntu/hardy/+source/netsurf">Ubuntu 8.04 (Hardy)</a></li>
-</ul></dd>
-<dt>NetBSD Packages Collection (pkgsrc)</dt>
-<dd><ul>
-<li><a href="http://pkgsrc.se/wip/netsurf">NetBSD and others</a></li>
-</ul></dd>
-<dt>Slackware</dt>
-<dd><ul>
-<li><a href="http://www.slacky.eu/index.php?option=com_content&amp;task=view&amp;id=7785&amp;Itemid=65">Slacky - The Italian Slackware Community</a></li>
-</ul></dd>
-<dt>Puppy Linux</dt>
-<dd><ul>
-<li><a href="http://distro.ibiblio.org/pub/linux/distributions/puppylinux/pet_packages-4/">Puppy Linux</a></li>
-</ul></dd>
-</dl>-->
 
 <h2>Previous releases</h2>
 <dl>
@@ -249,13 +237,13 @@
 
 <h2>Framebuffer NetSurf</h2>
 
-<p>There are actually two versions of NetSurf available for Unix-like systems. In addition to the GTK front end, which is for normal desktop usage, there is a framebuffer front end for NetSurf which requires no windowing environment or GUI toolkits. It currently supports the Linux framebuffer and ABLE's framebuffer.</p>
+<p>There are actually two versions of NetSurf available for Unix-like systems. In addition to the GTK front end, which is for normal desktop usage, there is a framebuffer front end for NetSurf which requires no windowing environment or GUI toolkits. It currently supports SDLv1.</p>
 
 <p>Please obtain the <a href="/downloads/source/">latest source</a>, if you want to play with the framebuffer build.</p>
 
 
 <div class="footer">
-<p>Copyright 2003 - 2016 The NetSurf Developers</p>
+<p>Copyright 2003 - 2020 The NetSurf Developers</p>
 </div>
 
 </div>
diff --git a/downloads/index.html b/downloads/index.html
index 9fd1bb9..c3daaa9 100644
--- a/downloads/index.html
+++ b/downloads/index.html
@@ -54,11 +54,19 @@
 
 <h1>NetSurf Downloads</h1>
 
-<p>Download NetSurf for your operating system:</p>
+<p>The NetSurf project provides prebuilt software for several toolkits
+while some are provided by other organisations.</p>
+
+<p>NetSurf supports several windowing toolkits, some of these toolkits
+are synonymous with their operating system like RISC OS while others
+like GTK can be built on many operating systems.</p>
+
+<p>Please select the appropriate toolkit or Operating system for
+additional details:</p>
 
 <ul class="downloadosselection">
 <li class="riscos"><a href="riscos/">RISC OS</a></li>
-<li class="gtk"><a href="gtk/">Linux and other Unix-likes</a></li>
+<li class="gtk"><a href="gtk/">GTK for Linux and other Unix-likes</a></li>
 <li class="beos"><a href="beos/">Haiku &amp; BeOS</a></li>
 <li class="amiga"><a href="amiga/">AmigaOS</a></li>
 <li class="windows"><a href="windows/">Windows</a></li>
diff --git a/downloads/riscos/index.html b/downloads/riscos/index.html
index 7d5dedd..94a2968 100644
--- a/downloads/riscos/index.html
+++ b/downloads/riscos/index.html
@@ -62,39 +62,39 @@
 </div>
 
 <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.10.zip"><span>NetSurf 3.10 for RISC&nbsp;OS</span> <span>(4.0MB)</span> <span class="downloaddate">24 May 2020</span></a></p>
-<p class="downloadinstructions"><a href="/documentation/roinfo#GettingStartedInstallation">Installation instructions</a></p>
-<p class="preul">Binary download includes:</p>
-<ul>
-<li><a href="http://sudden.recoil.org/others/">AcornURI</a></li>
-<li><a href="/projects/iconv/">Iconv</a></li>
-<li><a href="http://www.riscos.info/downloads/gccsdk/sharedunixlib/system.zip">SharedUnixLibrary</a></li>
-<li><a href="/projects/tinct/">Tinct</a></li>
-</ul>
-<p class="preul">Requires either:</p>
-<ul>
-<li>RISC OS 6; any version</li>
-<li>RISC OS 5.07 or later</li>
-<li>RISC OS 4.02 or later</li>
-</ul>
-</div>
+  <div class="downloadlatest">
+    <div class="downloadlatestbox">
+      <p class="downloadmain downloadfirst"><a href="http://download.netsurf-browser.org/netsurf/releases/pre-built/riscos/netsurf-3.10.zip"><span>NetSurf 3.10 for RISC&nbsp;OS</span> <span>(4.0MB)</span> <span class="downloaddate">24 May 2020</span></a></p>
+      <p class="downloadinstructions"><a href="/documentation/roinfo#GettingStartedInstallation">Installation instructions</a></p>
+      <p class="preul">Binary download includes:</p>
+      <ul>
+	<li><a href="http://sudden.recoil.org/others/">AcornURI</a></li>
+	<li><a href="/projects/iconv/">Iconv</a></li>
+	<li><a href="http://www.riscos.info/downloads/gccsdk/sharedunixlib/system.zip">SharedUnixLibrary</a></li>
+	<li><a href="/projects/tinct/">Tinct</a></li>
+      </ul>
+      <p class="preul">Requires either:</p>
+      <ul>
+	<li>RISC OS 6; any version</li>
+	<li>RISC OS 5.07 or later</li>
+	<li>RISC OS 4.02 or later</li>
+      </ul>
+    </div>
 
-<div class="downloadlatestbox downloadlast">
-<p class="downloadmain"><a href="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.10-src.tar.gz"><span>NetSurf 3.10 source code</span> <span>(3.9MB)</span> <span class="downloaddate">24 May 2020</span></a></p>
-<p class="downloadinstructions"><a href="/downloads/source/#BuildInstructions">Build instructions</a></p>
-<p class="preul">Build NetSurf for:</p>
-<ul>
-<li>RISC OS</li>
-<li>Linux</li>
-<li>Free/NetBSD</li>
-<li>Solaris</li>
-<li>And more</li>
-</ul>
-</div>
-</div>
-<div class="arrow"></div>
+    <div class="downloadlatestbox downloadlast">
+      <p class="downloadmain"><a href="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-3.10.tar.gz"><span>NetSurf 3.10 source code</span> <span>(8.5MB)</span> <span class="downloaddate">24 May 2020</span></a></p>
+      <p class="downloadinstructions"><a href="/downloads/source/#BuildInstructions">Build instructions</a></p>
+      <p class="preul">Build NetSurf for:</p>
+      <ul>
+	<li>RISC OS</li>
+	<li>Linux</li>
+	<li>Free/NetBSD</li>
+	<li>Solaris</li>
+	<li>And more</li>
+      </ul>
+    </div>
+  </div>
+  <div class="arrow"></div>
 </div>
 
 <p>Check out the <a href="http://download.netsurf-browser.org/netsurf/releases/ChangeLog.txt">change log</a> to see what's changed since the last release.</p>