download page for beta2 ; link to JEM demo

4 files changed, 54 insertions, 52 deletions

diff --git a/demos/index.html b/demos/index.html
index 384f3f90b..2a10c15aa 100644
--- a/demos/index.html
+++ b/demos/index.html
@@ -25,10 +25,14 @@ to your web browser.
 </P>
 <P>
 <A HREF="http://webalt.math.helsinki.fi/PublicFiles/CD/Screencast/TextMathEditor%20Demo.swf">WebALT Math Editor</A>:
-create mathematical exercises in six languages simultaneously.
+create mathematical exercises in six languages simultaneously (film).
 </P>
 <P>
-<A HREF="http://www.cs.chalmers.se/~bringert/demos/tramdemo/">Tramdemo</A>: find your way in
+<B>NEW</B> <A HREF="http://www.jem-thematic.net/en/node/846#comment-209">WebALT Math translator</A>:
+translate mathematical exercises in a web service using incremental parsing.
+</P>
+<P>
+<A HREF="http://www.cs.chalmers.se/~bringert/demos/gotgodis/">Tramdemo</A>: find your way in
 Gothenburg public transport system, in six languages (film).
 </P>
 <P>
diff --git a/demos/index.txt b/demos/index.txt
index 9f3c17516..cbf1ed807 100644
--- a/demos/index.txt
+++ b/demos/index.txt
@@ -18,9 +18,12 @@ to your web browser.
 %restaurant reviews in a multilingual Wiki.
 
 [WebALT Math Editor  http://webalt.math.helsinki.fi/PublicFiles/CD/Screencast/TextMathEditor%20Demo.swf]:
-create mathematical exercises in six languages simultaneously.
+create mathematical exercises in six languages simultaneously (film).
 
-[Tramdemo http://www.cs.chalmers.se/~bringert/demos/tramdemo/]: find your way in
+**NEW** [WebALT Math translator http://www.jem-thematic.net/en/node/846#comment-209]:
+translate mathematical exercises in a web service using incremental parsing.
+
+[Tramdemo http://www.cs.chalmers.se/~bringert/demos/gotgodis/]: find your way in
 Gothenburg public transport system, in six languages (film).
 
 [GF Language Trainer http://csmisc14.cs.chalmers.se/~bjorn/langtrain.cgi]:
diff --git a/download/index.html b/download/index.html
index e2ba11b4c..23d1e76a6 100644
--- a/download/index.html
+++ b/download/index.html
@@ -14,47 +14,39 @@
 </P>
 <H2>Latest release</H2>
 <UL>
-<LI><A HREF="gf-3.0beta-linux-ubuntu.gz">GF 3.0 beta Linux binary</A> (Intel, Ubuntu)
+<LI><A HREF="GF-3.0-beta2-i686-pc-linux-gnu.tgz">GF 3.0 beta2 Linux binary package</A> (Intel, Ubuntu)
 <P></P>
-<LI>GF 3.0 beta MacOS X binaries: 
-  <A HREF="gf-3.0beta-mac-leopard.gz">Leopard</A> (Intel Mac with MacOS X Leopard)
-  <A HREF="gf-3.0beta-mac-tiger.gz">Tiger</A> (Intel Mac with MacOS X Tiger)
-</UL>
-
-<UL>
-<LI><A HREF="gf-3.0beta.tgz">GF 3.0 beta sources</A>
+<LI>GF 3.0 beta2 MacOS X binary package: 
+  <A HREF="GF-3.0-beta2-i386-apple-darwin9.4.0.tgz">Leopard</A> (Intel Mac with MacOS X Leopard)
+  <A HREF="GF-3.0-beta2-i386-apple-darwin8.11.1.tgz">Tiger</A> (Intel Mac with MacOS X Tiger)
+<P></P>
+<LI><A HREF="gf-3.0-beta2.zip">GF 3.0 beta2 Windows package</A> (includes libraries)
+<P></P>
+<LI><A HREF="GF-3.0-beta2.tgz">GF 3.0 beta2 sources</A> (both system and library)
 <P></P>
 <LI><A HREF="gf-lib-1.4.tgz">GF libraries v 1.4</A> (compiled resource grammar libraries)
 </UL>
 
-<H2>Old releases</H2>
-<UL>
-<LI><A HREF="../../GF2/download/index.html">GF 2.9 download page</A>
-</UL>
-
 <H2>Installation instructions</H2>
 <P>
-To install a binary, just uncompress it and copy to a place that is on your path,
-for instance, in <CODE>/usr/local/bin</CODE>. You may want to rename it to <CODE>gf</CODE>.
+The Windows package is installed by just unpacking it anywhere. It finds the libraries
+relative to the <CODE>.exe</CODE> file.
 </P>
 <P>
-If you want to use GF as a batch compiler, put the following script in the
-same place as the GF binary. If it is <I>not</I> <CODE>/usr/local/bin</CODE>, change
-the <CODE>prefix</CODE> variable in the script.
+To install a binary package for Linux and Mac OS X:
 </P>
-<UL>
-<LI><A HREF="./gfc">gfc script for patch compiler</A>
-</UL>
+<OL>
+<LI>uncompress the package by <CODE>tar -xfz</CODE>
+<LI><CODE>cd</CODE> to the created directory
+<LI><CODE>./configure</CODE>
+<LI><CODE>make install</CODE>
+</OL>
 
 <P>
 The Mac OS X binary (Intel) requires Readline from
 <A HREF="http://www.macports.org/">Mac Ports</A>. To install, see above item.
 </P>
 <P>
-The Windows binary is easiest if you have
-<A HREF="http://www.cygwin.com/">Cygwin</A>. To install, see above item.
-</P>
-<P>
 To compile and install from source: 
 </P>
 <PRE>
@@ -66,7 +58,7 @@ To compile and install from source:
     make install
 </PRE>
 <P>
-To install the libraries, unpack them in the place to which your
+To install the libraries (if done separately), unpack them in the place to which your
 <CODE>GF_LIB_PATH</CODE> points.
 </P>
 <PRE>
@@ -80,7 +72,12 @@ If this variable hasn't been defined, it is useful define it, e.g.
     export GF_LIB_PATH=/usr/local/lib/gf/
 </PRE>
 <P></P>
+<H2>Old releases</H2>
+<UL>
+<LI><A HREF="../../GF2/download/index.html">GF 2.9 download page</A>
+</UL>
+
 
 <!-- html code generated by txt2tags 2.4 (http://txt2tags.sf.net) -->
-<!-- cmdline: txt2tags -thtml download/index.txt -->
+<!-- cmdline: txt2tags -thtml index.txt -->
 </BODY></HTML>
diff --git a/download/index.txt b/download/index.txt
index 72bebe245..f1612c3d5 100644
--- a/download/index.txt
+++ b/download/index.txt
@@ -7,42 +7,35 @@ Grammatical Framework Download and Installation
 
 ==Latest release==
 
-- [GF 3.0 beta Linux binary    gf-3.0beta-linux-ubuntu.gz] (Intel, Ubuntu)
+- [GF 3.0 beta2 Linux binary package GF-3.0-beta2-i686-pc-linux-gnu.tgz] (Intel, Ubuntu)
 
-- GF 3.0 beta MacOS X binaries: 
-  [Leopard  gf-3.0beta-mac-leopard.gz] (Intel Mac with MacOS X Leopard)
-  [Tiger  gf-3.0beta-mac-tiger.gz] (Intel Mac with MacOS X Tiger)
+- GF 3.0 beta2 MacOS X binary package: 
+  [Leopard GF-3.0-beta2-i386-apple-darwin9.4.0.tgz] (Intel Mac with MacOS X Leopard)
+  [Tiger  GF-3.0-beta2-i386-apple-darwin8.11.1.tgz] (Intel Mac with MacOS X Tiger)
 
-% - [GF 3.0 beta Windows binary  gf-3.0beta-windows.exe]
+- [GF 3.0 beta2 Windows package  gf-3.0-beta2.zip] (includes libraries)
 
-- [GF 3.0 beta sources         gf-3.0beta.tgz]
+- [GF 3.0 beta2 sources         GF-3.0-beta2.tgz] (both system and library)
 
 - [GF libraries v 1.4          gf-lib-1.4.tgz] (compiled resource grammar libraries)
 
 
-==Old releases==
-
-- [GF 2.9 download page ../../GF2/download/index.html]
-
 
 ==Installation instructions==
 
-To install a binary, just uncompress it and copy to a place that is on your path,
-for instance, in ``/usr/local/bin``. You may want to rename it to ``gf``.
-
-If you want to use GF as a batch compiler, put the following script in the
-same place as the GF binary. If it is //not// ``/usr/local/bin``, change
-the ``prefix`` variable in the script.
+The Windows package is installed by just unpacking it anywhere. It finds the libraries
+relative to the ``.exe`` file.
 
-- [gfc script for patch compiler ./gfc]
+To install a binary package for Linux and Mac OS X:
++ uncompress the package by ``tar -xfz``
++ ``cd`` to the created directory
++ ``./configure``
++ ``make install``
 
 
 The Mac OS X binary (Intel) requires Readline from
 [Mac Ports http://www.macports.org/]. To install, see above item.
 
-The Windows binary is easiest if you have
-[Cygwin http://www.cygwin.com/]. To install, see above item.
-
 To compile and install from source: 
 ```
   tar xvfz gf-3.0beta.tgz
@@ -52,7 +45,7 @@ To compile and install from source:
   make
   make install
 ```
-To install the libraries, unpack them in the place to which your
+To install the libraries (if done separately), unpack them in the place to which your
 ``GF_LIB_PATH`` points.
 ```
   cd $GF_LIB_PATH
@@ -64,3 +57,8 @@ If this variable hasn't been defined, it is useful define it, e.g.
 ```
 
 
+==Old releases==
+
+- [GF 2.9 download page ../../GF2/download/index.html]
+
+