diff --git a/lib/resource/doc/Makefile b/lib/resource/doc/Makefile
index 1af678c52..af91c3a1b 100644
--- a/lib/resource/doc/Makefile
+++ b/lib/resource/doc/Makefile
@@ -22,6 +22,18 @@ gfdoc:
 	gfdoc ../french/VerbsFre.gf ; mv ../french/VerbsFre.html .
 	gfdoc ../french/BasicFre.gf ; mv ../french/BasicFre.html .
 
+	gfdoc ../norwegian/ParadigmsNor.gf ; mv ../norwegian/ParadigmsNor.html .
+	gfdoc ../norwegian/VerbsNor.gf ; mv ../norwegian/VerbsNor.html .
+	gfdoc ../norwegian/BasicNor.gf ; mv ../norwegian/BasicNor.html .
+
+	gfdoc ../italian/ParadigmsIta.gf ; mv ../italian/ParadigmsIta.html .
+	gfdoc ../italian/BasicIta.gf ; mv ../italian/BasicIta.html .
+	gfdoc ../italian/BeschIta.gf ; mv ../italian/BeschIta.html .
+
+	gfdoc ../spanish/ParadigmsSpa.gf ; mv ../spanish/ParadigmsSpa.html .
+	gfdoc ../spanish/BasicSpa.gf ; mv ../spanish/BasicSpa.html .
+	gfdoc ../spanish/BeschSpa.gf ; mv ../spanish/BeschSpa.html .
+
 gifs: api lang scand low
 
 api:
diff --git a/lib/resource/doc/gf-resource.html b/lib/resource/doc/gf-resource.html
index ae9eaa836..71b61a5b8 100644
--- a/lib/resource/doc/gf-resource.html
+++ b/lib/resource/doc/gf-resource.html
@@ -460,6 +460,26 @@ Alternative views on sentence formation:
 
 <p>
 
+<a href="ParadigmsIta.html">Italian paradigms</a>
+<br>
+<a href="BasicIta.html">example use of Italian paradigms</a>
+<br>
+<a href="BeschIta.html">Italian verb conjugations</a>
+
+<p>
+
+<a href="ParadigmsNor.html">Norwegian paradigms</a>
+<br>
+<a href="BasicNor.html">example use of Norwegian paradigms</a>
+<br>
+<a href="VerbsNor.html">Norwegian verbs</a>
+<p>
+
+<a href="ParadigmsSpa.html">Spanish paradigms</a>
+<br>
+<a href="BeschSpa.html">Spanish verb conjugations</a>
+<p>
+
 <a href="ParadigmsSwe.html">Swedish paradigms</a>
 <br>
 <a href="BasicSwe.html">example use of Swedish paradigms</a>
@@ -487,7 +507,7 @@ Test with random generation, translation, morphological analysis...
 
 Morpho quiz with words:
 <pre>
-
+  i 
 
 </pre>
 Morpho quiz with phrases:
@@ -631,7 +651,7 @@ where English has <i>Who loves lions?</i>
 
 
 <!-- NEW -->
-<h2>The use of parametric modules</h2>
+<h2>The use of parametrized modules</h2>
 
 In two language families:
 <ul>
@@ -651,12 +671,12 @@ In two language families:
 <tr><td>Danish</td>    <td> </td> <td>X</td> <td> </td> <td> </td> <td> </tr>
 <tr><td>English</td>   <td>X</td> <td>X</td> <td>X</td> <td>X</td> <td>X</tr>
 <tr><td>Finnish</td>   <td>X</td> <td> </td> <td> </td> <td> </td> <td> </tr>
-<tr><td>French</td>    <td>X</td> <td>*</td> <td>X</td> <td>X</td> <td>X</tr>
+<tr><td>French</td>    <td>X</td> <td>X</td> <td>X</td> <td>X</td> <td>X</tr>
 <tr><td>German</td>    <td>X</td> <td> </td> <td>*</td> <td> </td> <td> </tr>
-<tr><td>Italian</td>   <td>X</td> <td>*</td> <td>*</td> <td> </td> <td>*</tr>
-<tr><td>Norwegian</td> <td> </td> <td>X</td> <td> </td> <td> </td> <td> </tr>
+<tr><td>Italian</td>   <td>X</td> <td>X</td> <td>X</td> <td>X</td> <td>X</tr>
+<tr><td>Norwegian</td> <td> </td> <td>X</td> <td>X</td> <td>X</td> <td>X</tr>
 <tr><td>Russian</td>   <td>X</td> <td>*</td> <td>*</td> <td> </td> <td> </tr>
-<tr><td>Spanish</td>   <td> </td> <td>*</td> <td> </td> <td> </td> <td>*</tr>
+<tr><td>Spanish</td>   <td> </td> <td>X</td> <td>X</td> <td> </td> <td>X</tr>
 <tr><td>Swedish</td>   <td>X</td> <td>X</td> <td>X</td> <td>X</td> <td>X</tr>
 </table>
 
@@ -674,4 +694,4 @@ To appear later at GF Homepage:<p>
 
 <a href="http://www.cs.chalmers.se/%7Eaarne/GF">
 <tt>http://www.cs.chalmers.se/~aarne/GF</tt></a>
-</p></body></html>
\ No newline at end of file
+</p></body></html>
diff --git a/src/GF/API.hs b/src/GF/API.hs
index 8e1526ca6..134c7b8d6 100644
--- a/src/GF/API.hs
+++ b/src/GF/API.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/03/08 15:51:17 $ 
--- > CVS $Author: bringert $
--- > CVS $Revision: 1.30 $
+-- > CVS $Date: 2005/04/12 15:20:29 $ 
+-- > CVS $Author: aarne $
+-- > CVS $Revision: 1.31 $
 --
 -- Application Programmer's Interface to GF; also used by Shell. AR 10/11/2001
 -----------------------------------------------------------------------------
@@ -91,28 +91,28 @@ linearize sgr = err id id . optLinearizeTree opts sgr where
 linearizeToAll :: [GFGrammar] -> Tree -> [String]
 linearizeToAll grs t = [linearize gr t | gr <- grs]
 
-parse :: GFGrammar -> CFCat -> String -> [Tree]
+parse :: GFGrammar -> GFCat -> String -> [Tree]
 parse sgr cat = errVal [] . parseString noOptions sgr cat
 
-parseAny :: [GFGrammar] -> CFCat -> String -> [Tree]
+parseAny :: [GFGrammar] -> GFCat -> String -> [Tree]
 parseAny grs cat s = concat [parse gr cat s | gr <- grs]
 
-translate :: GFGrammar -> GFGrammar -> CFCat -> String -> [String]
+translate :: GFGrammar -> GFGrammar -> GFCat -> String -> [String]
 translate ig og cat = map (linearize og) . parse ig cat
 
-translateToAll :: GFGrammar -> [GFGrammar] -> CFCat -> String -> [String]
+translateToAll :: GFGrammar -> [GFGrammar] -> GFCat -> String -> [String]
 translateToAll ig ogs cat = concat . map (linearizeToAll ogs) . parse ig cat
 
-translateFromAny :: [GFGrammar] -> GFGrammar -> CFCat -> String -> [String]
+translateFromAny :: [GFGrammar] -> GFGrammar -> GFCat -> String -> [String]
 translateFromAny igs og cat s = concat [translate ig og cat s | ig <- igs]
 
-translateBetweenAll :: [GFGrammar] -> CFCat -> String -> [String]
+translateBetweenAll :: [GFGrammar] -> GFCat -> String -> [String]
 translateBetweenAll grs cat = concat . map (linearizeToAll grs) . parseAny grs cat
 
-homonyms :: GFGrammar -> CFCat -> Tree -> [Tree]
+homonyms :: GFGrammar -> GFCat -> Tree -> [Tree]
 homonyms gr cat = nub . parse gr cat . linearize gr
 
-hasAmbiguousLin :: GFGrammar -> CFCat -> Tree -> Bool
+hasAmbiguousLin :: GFGrammar -> GFCat -> Tree -> Bool
 hasAmbiguousLin gr cat t = case (homonyms gr cat t) of
   _:_:_ -> True
   _ -> False