From 9bf5c98509d5550dfba52eb04606441bd86461b7 Mon Sep 17 00:00:00 2001
From: "John J. Camilleri" <john@johnjcamilleri.com>
Date: Tue, 27 Nov 2018 22:36:57 +0100
Subject: [PATCH] Work on new download page. Change 18-12 to 4.0.0

---
 bin/update_html           |  4 +-
 download/index.md         | 91 ++++++++++++++++++++++++---------------
 download/release-18-12.md | 16 -------
 download/release-4.0.0.md | 16 +++++++
 index.html                |  3 +-
 5 files changed, 76 insertions(+), 54 deletions(-)
 delete mode 100644 download/release-18-12.md
 create mode 100644 download/release-4.0.0.md

diff --git a/bin/update_html b/bin/update_html
index 26dfc80fe..ec82ec491 100755
--- a/bin/update_html
+++ b/bin/update_html
@@ -52,7 +52,7 @@ function render_t2t_html {
 
   # Final post-processing
   if [ -f "$html" ] ; then
-    sed -i.bak "s/<table>/<table class=\"table\">/" "$html" && rm "$html.bak"
+    sed -i.bak "s/<table/<table class=\"table\"/" "$html" && rm "$html.bak"
     echo "$html"
   fi
 }
@@ -77,7 +77,7 @@ function render_md_html {
 
   # Final post-processing
   if [ -f "$html" ] ; then
-    sed -i.bak "s/<table>/<table class=\"table\">/" "$html" && rm "$html.bak"
+    sed -i.bak "s/<table/<table class=\"table\"/" "$html" && rm "$html.bak"
     echo "$html"
   fi
 }
diff --git a/download/index.md b/download/index.md
index a26096cc9..6bea6bba4 100644
--- a/download/index.md
+++ b/download/index.md
@@ -2,26 +2,27 @@
 title: Grammatical Framework Download and Installation
 ...
 
-**GF Bundle 18-12** was released on 28 November 2018.  
-It contains **GF v3.10** and **RGL snapshot 18-11-28**.
+**GF 4.0.0** was released on 28 November 2018.  
+It is the first version of GF which _does not include the RGL_.
 
-What's new? See the [release notes](release-18-12.html).
+What's new? See the [release notes](release-4.0.0.html).
 
-## Binary packages ("bundles")
+## Binary packages
+
+All binary releases are now hosted on [GitHub](https://github.com/GrammaticalFramework/gf-core/releases).
 
 | Platform        | Download                                                       | Features   | How to install                                              |
 |:----------------|:---------------------------------------------------------------|:-----------|:------------------------------------------------------------|
-| macOS           | [gf-18-12.pkg](gf-18-12.pkg)                                   | GF,S,C,J,P | Double-click on the package icon                            |
-| macOS           | [gf-18-12-bin-intel-mac.tar.gz](gf-18-12-bin-intel-mac.tar.gz) | GF,S,C,J,P | `sudo tar -C /usr/local -zxf gf-18-12-bin-intel-mac.tar.gz` |
-| Raspian 9.1     | [gf\_18-12-1\_armhf.deb](gf_18-12-1_armhf.deb)                 | GF,S,C,J,P | `sudo dpkg -i gf_18-12-1_armhf.deb`                         |
-| Ubuntu (32-bit) | [gf\_18-12-1\_i386.deb](gf_18-12-1_i386.deb)                   | GF,S,C,J,P | `sudo dpkg -i gf_18-12-1_i386.deb`                          |
-| Ubuntu (64-bit) | [gf\_18-12-1\_amd64.deb](gf_18-12-1_amd64.deb)                 | GF,S,C,J,P | `sudo dpkg -i gf_18-12-1_amd64.deb`                         |
-| Windows         | [gf-18-12-bin-windows.zip](gf-18-12-bin-windows.zip)           | GF,S       | `unzip gf-18-12-bin-windows.zip`                            |
+| macOS           | [gf-4.0.0.pkg](gf-4.0.0.pkg)                                   | GF,S,C,J,P | Double-click on the package icon                            |
+| macOS           | [gf-4.0.0-bin-intel-mac.tar.gz](gf-4.0.0-bin-intel-mac.tar.gz) | GF,S,C,J,P | `sudo tar -C /usr/local -zxf gf-4.0.0-bin-intel-mac.tar.gz` |
+| Raspian 9.1     | [gf\_4.0.0-1\_armhf.deb](gf_4.0.0-1_armhf.deb)                 | GF,S,C,J,P | `sudo dpkg -i gf_4.0.0-1_armhf.deb`                         |
+| Ubuntu (32-bit) | [gf\_4.0.0-1\_i386.deb](gf_4.0.0-1_i386.deb)                   | GF,S,C,J,P | `sudo dpkg -i gf_4.0.0-1_i386.deb`                          |
+| Ubuntu (64-bit) | [gf\_4.0.0-1\_amd64.deb](gf_4.0.0-1_amd64.deb)                 | GF,S,C,J,P | `sudo dpkg -i gf_4.0.0-1_amd64.deb`                         |
+| Windows         | [gf-4.0.0-bin-windows.zip](gf-4.0.0-bin-windows.zip)           | GF,S       | `unzip gf-4.0.0-bin-windows.zip`                            |
 
 **Features**
 
 - GF = GF shell and grammar compiler
-- RGL = Resource Grammar Library
 - S = `gf -server` mode
 - C = C run-time system
 - J/P = Java/Python binding to the C run-time system
@@ -113,41 +114,61 @@ work too.
 
 ## Installing from the latest developer source code
 
-The first time:
+If you haven't already, clone our repository with:
 
 ```
 git clone https://github.com/GrammaticalFramework/gf-core.git
-cd gf-core
+```
+
+If you've already cloned the repository previously, update with:
+
+```
+git pull
+```
+
+Then install with:
+
+```
 cabal install
 ```
 
-and
+or
 
 ```
-git clone https://github.com/GrammaticalFramework/gf-rgl.git
-cd gf-rgl
-make
-```
-
-Subsequently:
-
-```
-cd gf-core
-git pull
-cabal install
-```
-
-and
-
-```
-cd gf-rgl
-git pull
-make
+stack install
 ```
 
 The above notes for installing from source apply also in these cases.
-For more info on working with the GF source code, see the [GF Developers
-Guide](../doc/gf-developers.html).
+For more info on working with the GF source code, see the
+[GF Developers Guide](../doc/gf-developers.html).
+
+## Installing the RGL
+
+RGL releases are hosted on [GitHub](https://github.com/GrammaticalFramework/gf-rgl/releases).
+
+### Download pre-compiled
+
+TODO ...
+
+### Download release & compile
+
+TODO ...
+
+### Download latest developer version & compile
+
+Similar to the steps above, you need to
+
+```
+git clone https://github.com/GrammaticalFramework/gf-core.git
+```
+
+And then run
+
+```
+make
+```
+
+For more details about building the RGL, see [this page](https://github.com/GrammaticalFramework/gf-rgl/blob/master/README.md).
 
 ## Older releases
 
diff --git a/download/release-18-12.md b/download/release-18-12.md
deleted file mode 100644
index 81dab5c7d..000000000
--- a/download/release-18-12.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-title: GF Bundle 18-12 Release Notes
-date: 28 November 2018
-...
-
-## Installation
-
-See the [download page](index.html).
-
-## What's new
-
-- RGL split
-
-### GF v3.10
-
-### RGL 18-12-28
diff --git a/download/release-4.0.0.md b/download/release-4.0.0.md
new file mode 100644
index 000000000..574f82f94
--- /dev/null
+++ b/download/release-4.0.0.md
@@ -0,0 +1,16 @@
+---
+title: GF 4.0.0 Release Notes
+date: 28 November 2018
+...
+
+## Installation
+
+See the [download page](index.html).
+
+## What's new
+
+- In this release, the GF "core" (compiler and runtimes) have been split from the RGL.
+
+### Other
+
+- A lot of repository cleanup
diff --git a/index.html b/index.html
index df1a0eb98..129e12d79 100644
--- a/index.html
+++ b/index.html
@@ -229,7 +229,8 @@ least one, it may help you to get a first idea of what GF is.
     <dl class="row">
       <dt class="col-sm-3 text-center">2018-11-28</dt>
       <dd class="col-sm-9">
-        <strong>GF 18.12 released.</strong>
+        <strong>GF 4.0.0 released.</strong>
+        <a href="download/release-4.0.0.html">Release notes</a>
       </dd>
       <dt class="col-sm-3 text-center">2018-07-25</dt>
       <dd class="col-sm-9">