Fix and update URLs in the documentation.

	* doc/havm.texi (Top): Here.
	(wiki): Remove macro.

doc/havm.texi

@@ -23,10 +23,6 @@
 @end macro
 @end ifnothtml
 
-@macro wiki
-http://www.lrde.epita.fr/cgi-bin/twiki/view
-@end macro
-
 @macro havm
 @acronym{HAVM}
 @end macro
@@ -120,22 +116,25 @@ non strict functional language very well suited for this kind of
 symbolic processing.  @havm{} was coined on both Haskell, and
 @acronym{vm} standing for Virtual Machine.
 
-Information about @havm{} can be found on @href{@wiki{}/Projects/Havm,
-@havm{} Home Page}, and feedback can be sent to
+Information about @havm{} can be found on
+@href{http://www.lrde.epita.fr/wiki/Havm, @havm{} Home Page},
+and feedback can be sent to
 @href{projects@@lrde.epita.fr, @acronym{lrde}'s Projects Address}.
 @acronym{LRDE} stands for @href{http://www.lrde.epita.fr, Laboratoire de
 Recherche et Dévelopment de l'@acronym{EPITA}}, i.e., the Research and
-Development Labof @acronym{EPITA}, the @href{http://www.epita.fr, Ecole
+Development Labof @acronym{EPITA}, the @href{http://www.epita.fr, École
 Pour l'Informatique et les Techniques Avancées}.
 
-@href{FIXME:, Andrew Appel's home page} includes links to material
+@href{http://www.cs.princeton.edu/~appel/, Andrew Appel's home page}
+includes links to material
 related to compilers theory, and some information about the
-@href{FIXME:, Modern Compiler Implementation} book series.
+@href{http://www.cs.princeton.edu/~appel/modern/, Modern Compiler
+Implementation} book series.
 
 More information on Haskell can be found on
 @href{http://www.haskell.org, Haskell Home Page}.  @havm{} requires a
-specific Haskell compiler, @acronym{GHC}, the @href{FIXME: , Glasgow
-Haskell Compiler}.
+specific Haskell compiler, @acronym{GHC}, the
+@href{http://www.haskell.org/ghc/, Glasgow Haskell Compiler}.
 
 @menu
 * Invoking havm::               Command Line Interface