diff --git a/README.bugs b/doc/BUGS
similarity index 81%
rename from README.bugs
rename to doc/BUGS
index 4a96427a7c1c3ebe38ea6e52c8498b4bf134b8ee..dda0f2d88415cc9e665246fdcbc41ccb7d02345b 100644
--- a/README.bugs
+++ b/doc/BUGS
@@ -1,4 +1,4 @@
-$Id: README.bugs,v 1.2 2001-02-21 07:30:09 geuzaine Exp $
+$Id: BUGS,v 1.1 2001-03-04 16:28:12 geuzaine Exp $
 
 * Si la coherence des surfaces n'est pas recouvree en une etape, et
 qu'on fait une seconde passe qui marche, les volumes ne sont pas
diff --git a/doc/CONTRIBUTORS b/doc/CONTRIBUTORS
index fb6094aca2b492aa44aefae6bc576912c2192f07..2c6bf37397b4f5f944d5a6684120571ae7506772 100644
--- a/doc/CONTRIBUTORS
+++ b/doc/CONTRIBUTORS
@@ -1,31 +1,35 @@
-$Id: CONTRIBUTORS,v 1.1 2001-03-04 16:27:07 geuzaine Exp $
+$Id: CONTRIBUTORS,v 1.2 2001-03-04 16:30:54 geuzaine Exp $
 
-The Gmsh project is brought to you by
+Gmsh is copyright (c) 1997-2001 by
 
     Jean-François Remacle <remacle@scorec.rpi.edu>
     Christophe Geuzaine <christophe.geuzaine@ulg.ac.be>
 
-Thanks to the following folks who made the Gmsh project possible.
-These folks have greatly contributed by sending patches, requests,
-warnings, and pleas for changes or improvements. Also, thanks to the
-many others who did not make it to the list, but whose contributions
-were, none the less, greatly appreciated. While attempts were made to
-be as complete as possible, it is inevitable that some contributors
-have been omitted. For that, please accept our humble appologies.
-
-Please remember, when reading through this list, that email addresses
-change.  Some shown below will be in excess of ten years old.  It is
-unlikely all the addresses shown below are deliverable.  Under no
-circustances should you attempt to contact these individuals.  Any
-email concerning the Gmsh project should be addressed to
-<gmsh@geuz.org>.
-
-    Benoît Meys <>
+Significant parts of the code have been contributed by
+
+    ...
+
+Special thanks to the following folks who have greatly contributed by
+sending patches, requests, warnings, and pleas for changes or
+improvements. While attempts were made to be as complete as possible,
+it is inevitable that some contributors have been omitted. For that,
+please accept our humble appologies.
+
     Nicolas Moës <>
     Éric Bechet <>
     David Colignon <>
-    Marc Umé <>
     Patrick Dular <>
     Johan Gyselinck <>
+    Philippe Geuzaine <geuzaine@gnat.colorado.edu>
+    François Henrotte <fhenrott@esat.kuleuven.ac.be>
+    Benoît Meys <bmeys@techspace-aero.be>
+    André Nicolet <andre.nicolet@fresnel.fr>
+    Uwe Pahner <uwe.pahner@esat.kuleuven.ac.be>
+    Ahmed Rassili <a.rassili@ulg.ac.be>
+
+Finally, thanks to all of you who sent e-mail showing interrest. This
+has motivated us a lot to release the code as free software and to
+continue to improve it.
+
 
 
diff --git a/doc/FAQ b/doc/FAQ
new file mode 100644
index 0000000000000000000000000000000000000000..9a5988928888b1a915a307d497c26ed90cb2c681
--- /dev/null
+++ b/doc/FAQ
@@ -0,0 +1,28 @@
+
+Q. Gmsh complains about missing libraries.
+A. Try 'ldd gmsh' to check if all required shared are installed on
+your system.
+
+Q. Gmsh does not work under HP-UX.
+A. the HP version is reported not to work with native OpenGL. You
+should install install Mesa instead.
+
+Q. When moving the mouse over the graphic window, everything that is
+drawn on it disappears, and each item is visible only when the cursor
+is directly over it.
+A. You should start Gmsh with the '-noov' command line option.
+
+Q. The graphics display very slowly.
+A. Are you are executing Gmsh from a remote host (via the network)
+without GLX? You should turn double buffering off (with the -nodb
+command line option).
+
+Q. Big post-processing scenes are slow to display.
+A. Try display lists (-dl command line option).
+
+Q. Gmsh keeps re-displaying its graphics when other windows partially
+hide the graphical window. 
+A. Disable opaque move in your window manager.
+
+Q. What does Gmsh mean?
+A. Nothing ;-)
diff --git a/doc/README.cvs b/doc/README.cvs
new file mode 100644
index 0000000000000000000000000000000000000000..d24781307b383f932820e70133fa60a50d2a96a2
--- /dev/null
+++ b/doc/README.cvs
@@ -0,0 +1,17 @@
+
+To download the latset full source by CVS, type
+
+cvs -d :pserver:YOUR_NAME@elap57.montefiore.ulg.ac.be:/usr/users57/cvs-master COMMAND
+
+where YOUR_NAME is your username on elap57.montefiore.ulg.ac.be, and where COMMAND is
+first 'login' (you will be prompted for a password), and then 'checkout gmsh'. When
+this is done, you can use 'logout' to exit.
+
+To update your local version, type
+
+cvs update -dP
+
+To submit your changes, type
+
+cvs commit
+
diff --git a/doc/README.devel b/doc/README.devel
new file mode 100644
index 0000000000000000000000000000000000000000..9d736185f1bdb323e6f95b6ff397eca37452cc18
--- /dev/null
+++ b/doc/README.devel
@@ -0,0 +1,29 @@
+
+Some easy rules to make the code easy to read/debug/maintain:
+
+- please enable full warnings for your compiler (e.g. gcc -Wall)
+- always use Msg() to print information/errors/etc.
+- indent your files and, if working on Windows, suppress the tabs (untabify)
+
+
+How to add an option in the graphical user interface?
+
+1) Create the option in the Context_T class (Common/Context.h) if it's
+a classical option, or in the View class (Common/View.h) if it's a
+post-processing view-dependent option.
+
+2) In Common/DefaultOptions.h, give a name (for the parser to be able
+to access it), a reference to a handling routine (i.e. opt_XXX) and a
+default value for this option.
+
+3) Create the handling routine opt_XXX in Common/Options.cpp (and add
+the prototype in Common/Options.h).
+
+4) Create the associated widget in Fltk/GUI.cpp
+
+5) If no special callback is to be associated to the widget, add the
+handling routine opt_XXX to the OK callback for the corresponding
+option panel (in Fltk/Callbacks.cpp).
+
+6) That's it!
+
diff --git a/doc/README.leaks b/doc/README.leaks
new file mode 100644
index 0000000000000000000000000000000000000000..5f138056b35b93c84017dcd7190f866cd883d95c
--- /dev/null
+++ b/doc/README.leaks
@@ -0,0 +1,6 @@
+* LIBNJAMD
+
+export LD_PRELOAD=libnjamd.so
+
+ kill -USR1
+
diff --git a/doc/README.txt b/doc/README.txt
new file mode 100644
index 0000000000000000000000000000000000000000..60f3e497d66d97fcc7d122560eabf27a279fe0f0
--- /dev/null
+++ b/doc/README.txt
@@ -0,0 +1,32 @@
+$Id: README.txt,v 1.1 2001-03-04 16:27:07 geuzaine Exp $
+
+For Windows versions of Gmsh only:
+==================================
+
+1) About opengl32.dll:
+
+If a version of the OpenGL library opengl32.dll is already installed
+on your system, you should remove the version shipped with
+Gmsh. Failing to do so may result in an incorrect behaviour of Gmsh
+(the most common being the graphic window staying "transparent").
+
+2) About cygwin1.dll:
+
+If you plan to use other programs than Gmsh which depend on the
+cygwin1.dll library (e.g. GetDP, http://www.geuz.org/getdp/), you
+should keep only one version of the library on your system. For this
+purpose, you should move the file cygwin1.dll from this directory to
+the Windows system directory (usually C:\Windows\System\) and suppress
+all other versions of cygwin1.dll. Failing to do so may result in
+incorrect behaviour of applications sharing the library and running
+simultaneously.
+
+3) About configuration files:
+
+Gmsh saves session information and default options on disk. The
+directory in which these files are saved is (in that order) $HOME (if
+the HOME variable is defined, e.g. in your autoexec.bat file), $TEMP
+(if TEMP is defined) or $TMP (if TMP is defined). If none of these
+variables are defined, Gmsh will try to save/load its configuration
+files from the current working directory.
+
diff --git a/doc/Changelog b/doc/VERSIONS
similarity index 98%
rename from doc/Changelog
rename to doc/VERSIONS
index 2dc2d0e1803e09e8354f3d935ae20f6e506ee3c7..5091011a6f6a561fb5325b50271574498755588a 100644
--- a/doc/Changelog
+++ b/doc/VERSIONS
@@ -1,3 +1,5 @@
+$Id: VERSIONS,v 1.1 2001-03-04 16:27:07 geuzaine Exp $
+
 New in 1.17: Corrected physical points saving;
 
 New in 1.16: Added single/double buffer selection (only useful for
diff --git a/www/gmsh.html b/www/gmsh.html
index 0d7de977d39a0aca694b38c7a7092e810bdba465..1ed97508c339f4d3fbc57771d91440da444f2f0a 100644
--- a/www/gmsh.html
+++ b/www/gmsh.html
@@ -50,7 +50,7 @@ ENDSCRIPT--->
 This page is a mirror of <a href="/gmsh/">/gmsh/</a><p>
 ENDMIRROR--->
 
-<!---BEGINDATE$Date: 2001-03-04 13:24:29 $ENDDATE--->
+<!---BEGINDATE$Date: 2001-03-04 16:27:07 $ENDDATE--->
 
 Copyright &copy; 1998-2001<br>
 Jean-François Remacle and
@@ -230,9 +230,15 @@ files.
 
   <td><font face="Helvetica, Arial" size=-1>
 
-Online <A target = "_top" href="/gmsh/doc/tutorial.html">tutorial</A>
-and file <A target="_top" href="/gmsh/doc/FORMATS">formats</A>
-description.
+    <ul>
+      <li><A target="_top" href="/gmsh/doc/tutorial.html">Online tutorial</A>
+      <li><A target="_top" href="/gmsh/doc/FORMATS">File formats</A> description
+      <li><A target="_top" href="/gmsh/doc/VERSIONS">Version history</A>
+      <li><a target="_top" href="/gmsh/doc/BUGS">List of open bugs</a>
+      <li><a target="_top" href="/gmsh/doc/FAQ">Frequently asked questions</a>
+      <li><a target="_top" href="/gmsh/doc/CONTRIBUTORS">List of contributors</a>
+      <li><a target="_top" href="/gmsh/doc/README.txt">For Windows versions only</a>
+    </ul>
 
   </td>
 
@@ -303,64 +309,6 @@ Tutorial and demos for version 1.00
 </tr>
 
 
-<!------------------------------------------------------------------>
-
-<tr valign=top>
-
-  <td width="130" align="right">
-    <font color="#ffffff" face="Helvetica, Arial"><b>What's new</b></font></td>
-
-  <td width="60">
-  </td>
-
-  <td><font face="Helvetica, Arial" size=-1> 
-
-    <A target = "_top" href="/gmsh/doc/Changelog">Changelog</A>
-
-  </td>
-
-</tr>
-
-<!------------------------------------------------------------------>
-
-<tr valign=top>
-
-  <td width="130" align="right">
-    <font color="#ffffff" face="Helvetica, Arial"><b>Problems / Performance</b></font></td>
-
-  <td width="60">
-  </td>
-
-  <td><font face="Helvetica, Arial" size=-1>
-
-<ul>
-<li> If something goes wrong during the installation, it is likely
-because some libraries are not properly installed on your system. Try
-'ldd gmsh-name' to check all shared libraries dependencies. Warning:
-HP version is reported not to work with native OpenGL -> install Mesa
-instead.
-
-<li> (Motif versions only) If, when moving the mouse over the graphic
-window, everything that is drawn on it disappears, and each item is
-visible only when the cursor is directly over it, you should start
-Gmsh with the '-noov' command line option. (This will be fixed.)
-
-<li> (Motif versions only) Turn double buffering off (with the -nodb
-command line option) when working on a remote host with Mesa.
-
-<li> Try display lists (-dl option) when working with big
-post-processing data sets.
-
-<li> Disable opaque move in your window manager to prevent multiple
-expose events when an option window partially hides the graphical
-window.
-</ul>
-
-  </td>
-
-</tr>
-
-
 <!------------------------------------------------------------------>
 
 <tr valign=top>