diff --git a/examples/phrasebook/doc-phrasebook.html b/examples/phrasebook/doc-phrasebook.html
index 21ad0993e..21fc7b3b1 100644
--- a/examples/phrasebook/doc-phrasebook.html
+++ b/examples/phrasebook/doc-phrasebook.html
@@ -46,6 +46,7 @@ Showcase for project FP7-ICT-247914, Deliverable D10.2.
 History
 </P>
 <UL>
+<LI>1 September. Version 1.1: bug fixes, some new constructions.
 <LI>2 June. Version 1.0 released!
 <LI>29 May. Link to Google translate with the current language pair and phrase.
 <LI>27 May. Polish added.
@@ -116,7 +117,7 @@ The phrasebook has the following requirement specification:
 <P>
 The phrasebook is available as open-source software, licensed under GNU LGPL. 
 The source code resides in 
-<A HREF="http://code.haskell.org/gf/examples/phrasebook/"><CODE>code.haskell.org/gf/examples/phrasebook/</CODE></A>
+<A HREF="http://www.grammaticalframework.org/examples/phrasebook/"><CODE>www.grammaticalframework.org/examples/phrasebook/</CODE></A>
 </P>
 <A NAME="toc2"></A>
 <H1>Points illustrated</H1>
@@ -179,7 +180,7 @@ The use of resource grammars and functors
 </P>
 <UL>
 <LI>the translator was implemented on top of an earlier linguistic knowledge base,
-  the <A HREF="http://grammaticalframework.com/lib">GF Resource Grammar Library</A>
+  the <A HREF="http://www.grammaticalframework.org/lib">GF Resource Grammar Library</A>
 </UL>
 
 <P>
@@ -259,9 +260,9 @@ The abstract syntax defines the <B>ontology</B> behind the phrasebook.
 Some explanations can be found in the 
 <A HREF="Ontology.html">ontology document</A>, which is produced from the
 abstract syntax files
-<A HREF="http://code.haskell.org/gf/examples/phrasebook/Sentences.gf"><CODE>Sentences.gf</CODE></A>
+<A HREF="http://www.grammaticalframework.org/examples/phrasebook/Sentences.gf"><CODE>Sentences.gf</CODE></A>
 and
-<A HREF="http://code.haskell.org/gf/examples/phrasebook/Words.gf"><CODE>Words.gf</CODE></A>
+<A HREF="http://www.grammaticalframework.org/examples/phrasebook/Words.gf"><CODE>Words.gf</CODE></A>
 by <CODE>make doc</CODE>.
 </P>
 <A NAME="toc8"></A>
@@ -277,7 +278,7 @@ locally on her own computer.
 </P>
 <A NAME="toc9"></A>
 <H1>Effort and cost</H1>
-<TABLE CELLPADDING="4" BORDER="1">
+<TABLE BORDER="1" CELLPADDING="4">
 <TR>
 <TH>Language</TH>
 <TH>Grammarian's language skills</TH>
@@ -588,7 +589,7 @@ The basic things "everyone" can do is
 <P>
 The missing concrete syntax entries are added to the <CODE>Words</CODE><I>L</I><CODE>.gf</CODE> 
 files for each language <I>L</I>. The
-<A HREF="http://code.haskell.org/gf/lib/doc/synopsis.html#toc78">morphological paradigms</A>
+<A HREF="http://www.grammaticalframework.org/lib/doc/synopsis.html#toc78">morphological paradigms</A>
 of the GF resource library should be used. Actions (prefixed with <CODE>A</CODE>, as <CODE>AWant</CODE>) are
 a little more demanding, since they also require syntax constructors. Greetings (prefixed
 with <CODE>G</CODE>) are pure strings.
@@ -597,9 +598,9 @@ with <CODE>G</CODE>) are pure strings.
 Some explanations can be found in the 
 <A HREF="Implementation.html">implementation document</A>, which is produced from the
 concrete syntax files
-<A HREF="http://code.haskell.org/gf/examples/phrasebook/SentencesI.gf"><CODE>SentencesI.gf</CODE></A>
+<A HREF="http://www.grammaticalframework.org/examples/phrasebook/SentencesI.gf"><CODE>SentencesI.gf</CODE></A>
 and
-<A HREF="http://code.haskell.org/gf/examples/phrasebook/WordsEng.gf"><CODE>WordsEng.gf</CODE></A>
+<A HREF="http://www.grammaticalframework.org/examples/phrasebook/WordsEng.gf"><CODE>WordsEng.gf</CODE></A>
 by <CODE>make doc</CODE>.
 </P>
 <P>
@@ -611,7 +612,7 @@ Here are the steps to follow for contributors:
   using <CODE>darcs pull</CODE>.
 <LI>Also make sure that you have compiled the library by <CODE>make present</CODE> in <CODE>gf/lib/src/</CODE>.
 <LI>Work in the directory 
-  <A HREF="http://code.haskell.org/gf/examples/phrasebook/"><CODE>gf/examples/phrasebook/</CODE></A>.
+  <A HREF="http://www.grammaticalframework.org/examples/phrasebook/"><CODE>gf/examples/phrasebook/</CODE></A>.
 <LI>After you've finished your contribution, recompile the phrasebook by <CODE>make pgf</CODE>.
 <LI>Save your changes in <CODE>darcs record .</CODE> (in the <CODE>phrasebook</CODE> subdirectory).
 <LI>Make a patch file with <CODE>darcs send -o my_phrasebook_patch</CODE>, which you can 
@@ -682,6 +683,6 @@ Willard Rafnsson,
 Nick Smallbone.
 </P>
 
-<!-- html code generated by txt2tags 2.4 (http://txt2tags.sf.net) -->
+<!-- html code generated by txt2tags 2.5 (http://txt2tags.sf.net) -->
 <!-- cmdline: txt2tags -thtml -\-toc doc-phrasebook.txt -->
 </BODY></HTML>
diff --git a/examples/phrasebook/doc-phrasebook.txt b/examples/phrasebook/doc-phrasebook.txt
index 0aa99d36a..6197790f8 100644
--- a/examples/phrasebook/doc-phrasebook.txt
+++ b/examples/phrasebook/doc-phrasebook.txt
@@ -76,7 +76,7 @@ The phrasebook has the following requirement specification:
 
 The phrasebook is available as open-source software, licensed under GNU LGPL. 
 The source code resides in 
-[``code.haskell.org/gf/examples/phrasebook/`` http://code.haskell.org/gf/examples/phrasebook/]
+[``www.grammaticalframework.org/examples/phrasebook/`` http://www.grammaticalframework.org/examples/phrasebook/]
 
 
 
@@ -119,7 +119,7 @@ Feed-back from users
 
 The use of resource grammars and functors
 - the translator was implemented on top of an earlier linguistic knowledge base,
-  the [GF Resource Grammar Library http://grammaticalframework.com/lib]
+  the [GF Resource Grammar Library http://www.grammaticalframework.org/lib]
 
 
 Example-based grammar writing and grammar induction from statistical models 
@@ -180,9 +180,9 @@ The abstract syntax defines the **ontology** behind the phrasebook.
 Some explanations can be found in the 
 [ontology document Ontology.html], which is produced from the
 abstract syntax files
-[``Sentences.gf`` http://code.haskell.org/gf/examples/phrasebook/Sentences.gf]
+[``Sentences.gf`` http://www.grammaticalframework.org/examples/phrasebook/Sentences.gf]
 and
-[``Words.gf`` http://code.haskell.org/gf/examples/phrasebook/Words.gf]
+[``Words.gf`` http://www.grammaticalframework.org/examples/phrasebook/Words.gf]
 by ``make doc``.
 
 
@@ -329,7 +329,7 @@ The basic things "everyone" can do is
 
 The missing concrete syntax entries are added to the ``Words``//L//``.gf`` 
 files for each language //L//. The
-[morphological paradigms http://code.haskell.org/gf/lib/doc/synopsis.html#toc78]
+[morphological paradigms http://www.grammaticalframework.org/lib/doc/synopsis.html#toc78]
 of the GF resource library should be used. Actions (prefixed with ``A``, as ``AWant``) are
 a little more demanding, since they also require syntax constructors. Greetings (prefixed
 with ``G``) are pure strings.
@@ -337,9 +337,9 @@ with ``G``) are pure strings.
 Some explanations can be found in the 
 [implementation document Implementation.html], which is produced from the
 concrete syntax files
-[``SentencesI.gf`` http://code.haskell.org/gf/examples/phrasebook/SentencesI.gf]
+[``SentencesI.gf`` http://www.grammaticalframework.org/examples/phrasebook/SentencesI.gf]
 and
-[``WordsEng.gf`` http://code.haskell.org/gf/examples/phrasebook/WordsEng.gf]
+[``WordsEng.gf`` http://www.grammaticalframework.org/examples/phrasebook/WordsEng.gf]
 by ``make doc``.
 
 Here are the steps to follow for contributors:
@@ -348,7 +348,7 @@ Here are the steps to follow for contributors:
   using ``darcs pull``.
 + Also make sure that you have compiled the library by ``make present`` in ``gf/lib/src/``.
 + Work in the directory 
-  [``gf/examples/phrasebook/`` http://code.haskell.org/gf/examples/phrasebook/].
+  [``gf/examples/phrasebook/`` http://www.grammaticalframework.org/examples/phrasebook/].
 + After you've finished your contribution, recompile the phrasebook by ``make pgf``.
 + Save your changes in ``darcs record .`` (in the ``phrasebook`` subdirectory).
 + Make a patch file with ``darcs send -o my_phrasebook_patch``, which you can