4 files changed, 45 insertions, 28 deletions
diff --git a/demos/index.html b/demos/index.html
index 2a10c15aa..e84e36eed 100644
--- a/demos/index.html
+++ b/demos/index.html
@@ -9,15 +9,28 @@
 </FONT></CENTER>
 
 <P>
-<A HREF="http://www.cs.chalmers.se/~markus/gramlets/letter-applet.html">Letter editor</A>: compose
-a letter in a language you don't know.
+<B>NEW</B> <A HREF="http://tournesol.cs.chalmers.se:41296/gwt/www/se.chalmers.cs.gf.gwt.FridgeApp/Fridge.html">Fridge poetry</A>
+</P>
+<P>
+<B>NEW</B> <A HREF="http://tournesol.cs.chalmers.se:41296/gwt/www/se.chalmers.cs.gf.gwt.TranslateApp/Translate.html">Word-completing translator</A>
+</P>
+<P>
+<B>NEW</B> <A HREF="http://www.youtube.com/watch?v=1bfaYHWS6zU">Tramdemo on YouTube</A>: 
+find your way in Gothenburg public transport system, in six languages (film).
+</P>
+<P>
+<B>NEW</B> <A HREF="http://csmisc14.cs.chalmers.se/~meza/restWiki/wiki.cgi">Multilingual Wiki</A>.
+</P>
+<P>
+<A HREF="index-numbers.html">Numeral translator for the iPhone</A>: number words in 15 languages.
 </P>
 <P>
-<A HREF="http://www.cs.chalmers.se/~bringert/gf/translate/">Numeral translator</A>: see 
+<A HREF="http://www.cs.chalmers.se/~bringert/gf/translate/">Numeral translator</A>:
 number words in 88 languages.
 </P>
 <P>
-<B>NEW</B> <A HREF="index-numbers.html">Numeral translator for the iPhone</A>.
+<A HREF="http://www.cs.chalmers.se/~markus/gramlets/letter-applet.html">Letter editor</A>: compose
+a letter in a language you don't know.
 </P>
 <P>
 <A HREF="http://www.cs.chalmers.se/~bringert/xv/pizza/">Pizza</A>: order a pizza by speaking
@@ -28,14 +41,10 @@ to your web browser.
 create mathematical exercises in six languages simultaneously (film).
 </P>
 <P>
-<B>NEW</B> <A HREF="http://www.jem-thematic.net/en/node/846#comment-209">WebALT Math translator</A>:
+<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>
 <A HREF="http://csmisc14.cs.chalmers.se/~bjorn/langtrain.cgi">GF Language Trainer</A>:
 translation quizzes in Arabic, English, Russian, Swedish.
 </P>
diff --git a/demos/index.txt b/demos/index.txt
index cbf1ed807..cc80d5ec6 100644
--- a/demos/index.txt
+++ b/demos/index.txt
@@ -2,30 +2,32 @@ Grammatical Framework Demos
 
 
 
+**NEW** [Fridge poetry http://tournesol.cs.chalmers.se:41296/gwt/www/se.chalmers.cs.gf.gwt.FridgeApp/Fridge.html]
 
-[Letter editor http://www.cs.chalmers.se/~markus/gramlets/letter-applet.html]: compose
-a letter in a language you don't know.
+**NEW** [Word-completing translator http://tournesol.cs.chalmers.se:41296/gwt/www/se.chalmers.cs.gf.gwt.TranslateApp/Translate.html]
+
+**NEW** [Tramdemo on YouTube http://www.youtube.com/watch?v=1bfaYHWS6zU]: 
+find your way in Gothenburg public transport system, in six languages (film).
+
+**NEW** [Multilingual Wiki http://csmisc14.cs.chalmers.se/~meza/restWiki/wiki.cgi].
+
+[Numeral translator for the iPhone index-numbers.html]: number words in 15 languages.
 
-[Numeral translator http://www.cs.chalmers.se/~bringert/gf/translate/]: see 
+[Numeral translator http://www.cs.chalmers.se/~bringert/gf/translate/]:
 number words in 88 languages.
 
-**NEW** [Numeral translator for the iPhone index-numbers.html].
+[Letter editor http://www.cs.chalmers.se/~markus/gramlets/letter-applet.html]: compose
+a letter in a language you don't know.
 
 [Pizza http://www.cs.chalmers.se/~bringert/xv/pizza/]: order a pizza by speaking
 to your web browser.
 
-%[Restauranggajden http://www.restauranggajden.se/tomas/]: write and read
-%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 (film).
 
-**NEW** [WebALT Math translator http://www.jem-thematic.net/en/node/846#comment-209]:
+[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]:
 translation quizzes in Arabic, English, Russian, Swedish.
 
diff --git a/doc/gf-summerschool.html b/doc/gf-summerschool.html
index 14561de37..6fac73612 100644
--- a/doc/gf-summerschool.html
+++ b/doc/gf-summerschool.html
@@ -37,7 +37,8 @@ pre-conference assignments.
 </P>
 <P>
 The official announcement will be in January 2009, and the summer school
-itself on 17-28 August 2009, in Gothenburg.
+itself on 17-28 August 2009, at the campus of Chalmers University of
+Technology in Gothenburg, Sweden.
 </P>
 <H2>Introduction</H2>
 <P>
@@ -208,7 +209,8 @@ by 2 weeks of summer school. Who are these participants?
 After the call has been published, persons interested to participate in
 the project are expected to learn GF by self-study from the 
 <A HREF="http://digitalgrammars.com/gf/doc/gf-tutorial.html">tutorial</A>. 
-This should take a couple of weeks.
+This should take a couple of weeks. Also an on-line course will be
+arranged to help in getting started with GF.
 </P>
 <P>
 Participants should continue to 
@@ -283,6 +285,7 @@ probably involved are the following:
 <LI>Robin Cooper
 <LI>Håkan Burden
 <LI>Markus Forsberg
+<LI>Harald Hammarström
 <LI>Peter Ljunglöf
 <LI>Aarne Ranta
 </UL>
@@ -312,7 +315,7 @@ Time schedule:
 <UL>
 <LI>February: announcement of summer school and the grammar
   writing contest to get participants
-<LI>March-April: work on the contest assignment (ca 1 month)
+<LI>March-April: on-line course, work on the contest assignment (ca 1 month)
 <LI>May: submission deadline and notification of acceptance
 <LI>June-July: more work on the grammars
 <LI>August: summer school
@@ -337,7 +340,6 @@ authors and WebALT Inc.
 Seven reasons:
 </P>
 <OL>
-<LI>free trip and stay in Gothenburg (for travel grant students)
 <LI>participation in a pioneering language technology work in an enthusiastic atmosphere
 <LI>work and fun with people from all over Europe and the world
 <LI>job opportunities and business ideas
@@ -347,6 +349,7 @@ Seven reasons:
 <LI>merits: the resulting grammar can easily lead to a published paper
 <LI>contribution to the multilingual and multicultural development of Europe and the
   world
+<LI>free trip and stay in Gothenburg (for travel grant students)
 </OL>
 
 
diff --git a/doc/gf-summerschool.txt b/doc/gf-summerschool.txt
index cb4efb1c8..a083d9e01 100644
--- a/doc/gf-summerschool.txt
+++ b/doc/gf-summerschool.txt
@@ -28,7 +28,8 @@ Travel grants will be available for students selected on the basis of
 pre-conference assignments. 
 
 The official announcement will be in January 2009, and the summer school
-itself on 17-28 August 2009, in Gothenburg.
+itself on 17-28 August 2009, at the campus of Chalmers University of
+Technology in Gothenburg, Sweden.
 
 
 
@@ -195,7 +196,8 @@ by 2 weeks of summer school. Who are these participants?
 After the call has been published, persons interested to participate in
 the project are expected to learn GF by self-study from the 
 [tutorial http://digitalgrammars.com/gf/doc/gf-tutorial.html]. 
-This should take a couple of weeks.
+This should take a couple of weeks. Also an on-line course will be
+arranged to help in getting started with GF.
 
 Participants should continue to 
 implement selected parts of the resource grammar, following the advice from
@@ -264,6 +266,7 @@ probably involved are the following:
 - Robin Cooper
 - Håkan Burden
 - Markus Forsberg
+- Harald Hammarström
 - Peter Ljunglöf
 - Aarne Ranta
 
@@ -291,7 +294,7 @@ Sweden, on 17-28 August 2009.
 Time schedule:
 - February: announcement of summer school and the grammar
   writing contest to get participants
-- March-April: work on the contest assignment (ca 1 month)
+- March-April: on-line course, work on the contest assignment (ca 1 month)
 - May: submission deadline and notification of acceptance
 - June-July: more work on the grammars
 - August: summer school
@@ -313,7 +316,6 @@ authors and WebALT Inc.
 ==Why I should participate==
 
 Seven reasons:
-+ free trip and stay in Gothenburg (for travel grant students)
 + participation in a pioneering language technology work in an enthusiastic atmosphere
 + work and fun with people from all over Europe and the world
 + job opportunities and business ideas
@@ -323,5 +325,6 @@ Seven reasons:
 + merits: the resulting grammar can easily lead to a published paper
 + contribution to the multilingual and multicultural development of Europe and the
   world
++ free trip and stay in Gothenburg (for travel grant students)