diff --git a/ChangeLog b/ChangeLog
index 427dea67d..f36b0e16b 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,7 @@ phpMyAdmin - Changelog
 $Id$ 
 $Source$
 
-2001-07-04  Olivier Müller  <om@omnis.ch>
+2001-07-04  Olivier Müller  <om@omnis.ch>   [uid23515]
 	* set version to 2.2.0rc1
 	* removed anything about "unofficial" from the pages
 	* updated links, and labels in all lang files
diff --git a/Documentation.html b/Documentation.html
index 4eb16388b..909916fc3 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -26,16 +26,19 @@ h1 {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: x-large; fo
 .simple {  font-family: Arial, Helvetica, sans-serif; font-size: smaller; color: #000000}
 body {  font-family: Arial, Helvetica, sans-serif; font-size: 10pt}
 td { font-family: Arial, Helvetica, sans-serif; font-size: 10pt }
+ul  { font-family: Arial, Helvetica, sans-serif; font-size: 10pt }
+ol  { font-family: Arial, Helvetica, sans-serif; font-size: 10pt }
+p  { font-family: Arial, Helvetica, sans-serif; font-size: 10pt }
 h2 { font-family: Verdana, Arial, Helvetica, sans-serif; font-size:large; font-weight:bold; color: #000066 }
 -->
 </style></head>
 
 <body bgcolor="#FFFFFF">
-<a name="top"></a><br>
+<a name="top"></a>
 <h1>phpMyAdmin 2.2.0 Documentation</h1>
 <ul>
-<li> <a class="navigation" href="http://www.phpwizard.net/projects/phpMyAdmin/">Official phpMyAdmin project homepage  [ http://www.phpwizard.net/projects/phpMyAdmin/</a> ]</li>
-<li> <a class="navigation" href="http://phpmyadmin.sourceforge.net/">Sourceforge phpMyAdmin download page  [ http://phpmyadmin.sourceforge.net/</a> ]</li>
+<li> <a class="navigation" href="http://www.phpwizard.net/projects/phpMyAdmin/">Official phpMyAdmin project homepage  &nbsp;&nbsp;&nbsp;[ http://www.phpwizard.net/projects/phpMyAdmin/</a> ]</li>
+<li> <a class="navigation" href="http://phpmyadmin.sourceforge.net/">Sourceforge phpMyAdmin download page  &nbsp;&nbsp;&nbsp;[ http://phpmyadmin.sourceforge.net/</a> ]</li>
 <li> Local documents:
 <ul>
 <li> Version history: <a class="navigation" href="ChangeLog">ChangeLog</a></li>
@@ -49,12 +52,12 @@ h2 { font-family: Verdana, Arial, Helvetica, sans-serif; font-size:large; font-w
 
 <a name="intro"></a><br>
 <hr noshade width="100%"><font size="+1">
-<a class="navigation2" href="#top">Top</a>  -   
-<a class="navigation2" href="#intro">Introduction</a>  - 
-<a class="navigation2" href="#setup">Installation</a>  -  
-<a class="navigation2" href="#config">Configuration</a>  - 
-<a class="navigation2" href="#faq">FAQ</a>  - 
-<a class="navigation2" href="#developpers">Developpers</a>  -  
+<a class="navigation2" href="#top">Top</a> &nbsp;-&nbsp;    
+<a class="navigation2" href="#intro">Introduction</a> &nbsp;-&nbsp;  
+<a class="navigation2" href="#setup">Installation</a> &nbsp;-&nbsp;   
+<a class="navigation2" href="#config">Configuration</a> &nbsp;-&nbsp;  
+<a class="navigation2" href="#faq">FAQ</a> &nbsp;-&nbsp;  
+<a class="navigation2" href="#developpers">Developpers</a> &nbsp;-&nbsp;   
 <a class="navigation2" href="#credits">Credits</a>
 </font><hr noshade width="100%">
 
@@ -82,12 +85,12 @@ h2 { font-family: Verdana, Arial, Helvetica, sans-serif; font-size:large; font-w
 
 <a name="setup"></a><br>
 <hr noshade width="100%"><font size="+1">
-<a class="navigation2" href="#top">Top</a>  -   
-<a class="navigation2" href="#intro">Introduction</a>  - 
-<a class="navigation2" href="#setup">Installation</a>  -  
-<a class="navigation2" href="#config">Configuration</a>  - 
-<a class="navigation2" href="#faq">FAQ</a>  - 
-<a class="navigation2" href="#developpers">Developpers</a>  -  
+<a class="navigation2" href="#top">Top</a> &nbsp;-&nbsp;    
+<a class="navigation2" href="#intro">Introduction</a> &nbsp;-&nbsp;  
+<a class="navigation2" href="#setup">Installation</a> &nbsp;-&nbsp;   
+<a class="navigation2" href="#config">Configuration</a> &nbsp;-&nbsp;  
+<a class="navigation2" href="#faq">FAQ</a> &nbsp;-&nbsp;  
+<a class="navigation2" href="#developpers">Developpers</a> &nbsp;-&nbsp;   
 <a class="navigation2" href="#credits">Credits</a>
 </font><hr noshade width="100%">
 
@@ -126,22 +129,22 @@ h2 { font-family: Verdana, Arial, Helvetica, sans-serif; font-size:large; font-w
     the extension from .html to something other won't work (it'd change all 
     "string".htmlspecialchars() constructs). </li>
 </ul>
-
 </p>
 
 
 
 <a name="config"></a><br>
 <hr noshade width="100%"><font size="+1">
-<a class="navigation2" href="#top">Top</a>  -   
-<a class="navigation2" href="#intro">Introduction</a>  - 
-<a class="navigation2" href="#setup">Installation</a>  -  
-<a class="navigation2" href="#config">Configuration</a>  - 
-<a class="navigation2" href="#faq">FAQ</a>  - 
-<a class="navigation2" href="#developpers">Developpers</a>  -  
+<a class="navigation2" href="#top">Top</a> &nbsp;-&nbsp;    
+<a class="navigation2" href="#intro">Introduction</a> &nbsp;-&nbsp;  
+<a class="navigation2" href="#setup">Installation</a> &nbsp;-&nbsp;   
+<a class="navigation2" href="#config">Configuration</a> &nbsp;-&nbsp;  
+<a class="navigation2" href="#faq">FAQ</a> &nbsp;-&nbsp;  
+<a class="navigation2" href="#developpers">Developpers</a> &nbsp;-&nbsp;   
 <a class="navigation2" href="#credits">Credits</a>
 </font><hr noshade width="100%">
 
+
 <h2>Configuration</h2>
 <p>All configurable data is placed in config.inc.php3.</p>
 <p><b>$cfgServers</b> array<br>
@@ -191,7 +194,7 @@ h2 { font-family: Verdana, Arial, Helvetica, sans-serif; font-size:large; font-w
 </p>
 <p><b>$cfgServers[n]['bookmarkdb']</b> string<br>
   <b>$cfgServers[n]['bookmarktable']</b> string<br>
-  Since release 2.3.0 phpMyAdmin allows to bookmark queries. This can be useful for queries
+  Since release 2.2.0 phpMyAdmin allows to bookmark queries. This can be useful for queries
   you often run. To use this functionality you have to:</p>
 <ul>
   <li>create a table following this scheme:<br>
@@ -263,12 +266,12 @@ are generated.<br>
 
 <a name="faq"></a><br>
 <hr noshade width="100%"><font size="+1">
-<a class="navigation2" href="#top">Top</a>  -   
-<a class="navigation2" href="#intro">Introduction</a>  - 
-<a class="navigation2" href="#setup">Installation</a>  -  
-<a class="navigation2" href="#config">Configuration</a>  - 
-<a class="navigation2" href="#faq">FAQ</a>  - 
-<a class="navigation2" href="#developpers">Developpers</a>  -  
+<a class="navigation2" href="#top">Top</a> &nbsp;-&nbsp;    
+<a class="navigation2" href="#intro">Introduction</a> &nbsp;-&nbsp;  
+<a class="navigation2" href="#setup">Installation</a> &nbsp;-&nbsp;   
+<a class="navigation2" href="#config">Configuration</a> &nbsp;-&nbsp;  
+<a class="navigation2" href="#faq">FAQ</a> &nbsp;-&nbsp;  
+<a class="navigation2" href="#developpers">Developpers</a> &nbsp;-&nbsp;   
 <a class="navigation2" href="#credits">Credits</a>
 </font><hr noshade width="100%">
 
@@ -371,18 +374,64 @@ Either there is an error with your PHP setup or your username/password is
 
 <a name="developpers"></a><br>
 <hr noshade width="100%"><font size="+1">
-<a class="navigation2" href="#top">Top</a>  -   
-<a class="navigation2" href="#intro">Introduction</a>  - 
-<a class="navigation2" href="#setup">Installation</a>  -  
-<a class="navigation2" href="#config">Configuration</a>  - 
-<a class="navigation2" href="#faq">FAQ</a>  - 
-<a class="navigation2" href="#developpers">Developpers</a>  -  
+<a class="navigation2" href="#top">Top</a> &nbsp;-&nbsp;    
+<a class="navigation2" href="#intro">Introduction</a> &nbsp;-&nbsp;  
+<a class="navigation2" href="#setup">Installation</a> &nbsp;-&nbsp;   
+<a class="navigation2" href="#config">Configuration</a> &nbsp;-&nbsp;  
+<a class="navigation2" href="#faq">FAQ</a> &nbsp;-&nbsp;  
+<a class="navigation2" href="#developpers">Developpers</a> &nbsp;-&nbsp;   
 <a class="navigation2" href="#credits">Credits</a>
 </font><hr noshade width="100%">
 
 <h2>Developpers Information</h2>
 
+<p> phpMyAdmin is Open Source, so you're invited to contribute to it.
+ Many great features have been written by other people and you too
+ can help to make phpMyAdmin a useful tool.</p>
 
+<p> 
+ If you're planning to contribute source, please read the following 
+ information:
+<ul> 
+ <li> All files include header.inc.php3 (layout), lib.inc.php3 (common functions)
+   and config.inc.php3. All configuration data belongs in config.inc.php3. 
+   Please keep it free from other code. 
+   Commonly used functions should be added to lib.inc.php3. </li>
+<li> Obviously, you're free to use whatever coding style you want. But please
+   try to keep your code as simple as possible: beginners are using phpMyAdmin
+   as an example application. </li>
+ <li> Please try to keep up the file-naming conventions. Table-related stuff
+   goes to tbl_*.php3, db-related code to db_*.php3 and so on. </li>
+ <li> Please don't use verbose strings in your code, instead add the string
+   (at least) to english.inc.php3 and print() it out. </li>
+ <li> If you want to be really helpful, write an entry for the ChangeLog. </li>
+</ul>
+</p>
+ 
+<p>
+ IMPORTANT:
+  With 1.4.1, development has switched to CVS. 
+  The following method is preferred for new developers:
+<ul>
+  <li> fetch the current CVS tree over anonymous CVS:<br>
+    <tt>cvs -d:pserver:anonymous@cvs.phpmyadmin.sourceforge.net:/cvsroot/phpmyadmin login</tt><br>
+    [Password: simply press the Enter key]<br>
+    <tt>cvs -z3 -d:pserver:anonymous@cvs.phpmyadmin.sourceforge.net:/cvsroot/phpmyadmin checkout phpMyAdmin</tt><br>
+      or<br>
+    <tt>cvs -z3 -d:pserver:anonymous@cvs.phpmyadmin.sourceforge.net:/cvsroot/phpmyadmin checkout phpMyAdmin-devel</tt><br>
+    [This will create a new sub-directory named phpMyAdmin or phpMyAdmin-devel] </li>
+  <li> add your stuff </li>
+  <li> put the modified files (tar'ed and gzip'ed) inside the patch tracker of the phpMyAdmin SourceForge account
+    (<a href="http://sourceforge.net/projects/phpmyadmin/" class="navigation">http://sourceforge.net/projects/phpmyadmin/</a>) </li>
+</ul>
+</p>
+
+
+<p>
+  Write access to the CVS tree is granted only to developers who have already
+  contributed something useful to phpMyAdmin.  If you're interested in that, 
+  please contact us using the phpmyadmin-devel mailing list.
+</p>
 
 
 
@@ -391,23 +440,103 @@ Either there is an error with your PHP setup or your username/password is
 
 <a name="credits"></a><br>
 <hr noshade width="100%"><font size="+1">
-<a class="navigation2" href="#top">Top</a>  -   
-<a class="navigation2" href="#intro">Introduction</a>  - 
-<a class="navigation2" href="#setup">Installation</a>  -  
-<a class="navigation2" href="#config">Configuration</a>  - 
-<a class="navigation2" href="#faq">FAQ</a>  - 
-<a class="navigation2" href="#developpers">Developpers</a>  -  
+<a class="navigation2" href="#top">Top</a> &nbsp;-&nbsp;    
+<a class="navigation2" href="#intro">Introduction</a> &nbsp;-&nbsp;  
+<a class="navigation2" href="#setup">Installation</a> &nbsp;-&nbsp;   
+<a class="navigation2" href="#config">Configuration</a> &nbsp;-&nbsp;  
+<a class="navigation2" href="#faq">FAQ</a> &nbsp;-&nbsp;  
+<a class="navigation2" href="#developpers">Developpers</a> &nbsp;-&nbsp;   
 <a class="navigation2" href="#credits">Credits</a>
 </font><hr noshade width="100%">
 
 <h2>Credits</h2>
 
+<pre>
+CREDITS, in chronological order
+-------------------------------
+
+[tr] - Tobias Ratschiller <tobias@phpwizard.net>
+        * creator of the phpmyadmin project
+        * maintainer from 1998 to summer 2000
+
+[md] - Marc Delisle <DelislMa@CollegeSherbrooke.qc.ca>
+        * multi-language version
+        * various fixes
+
+[om] - Olivier Müller <om@omnis.ch>
+        * started sourceforge phpMyAdmin project
+        * sync'ed different existing CVS trees with 
+          new features and bugfixes
+        * current project maintainer, with Marc and Loic
+
+[lc] - Loïc Chapeaux <lolo@phpHeaven.net>
+
+[mg] - Mirko Giese <mgiese@users.sourceforge.net>
+
+[rj] - Robin Johnson <robbat2@users.sourceforge.net>
+        * Database maintence controls
+        * Table type code
+
+[af] - Armel Fauveau <armel.fauveau@globalis-ms.com>
+        * Bookmarks feature
+        * Multiple dump feature
+
+[kc] - Korakot Chaovavanich <korakot@iname.com>
+[pk] - Pete Kelly <webmaster@trafficg.com>
 
 
 
+Original Credits of Version 2.1.0
+---------------------------------
+
+    This work is based on Peter Kuppelwieser's MySQL-Webadmin. It was his idea
+    to create a web-based interface to MySQL using PHP3. Although I have not
+    used any of his source-code, there are some concepts I've borrowed from
+    him. phpMyAdmin was created because Peter told me he wasn't going to further
+    develop his (great) tool.
+    Thanks go to
+    - Amalesh Kempf <ak-lsml@living-source.com> who contributed the code for  
+      the check when dropping a table or database. He also suggested that you 
+      should be able to specify the primary key on tbl_create.php3. To version
+      1.1.1 he contributed the ldi_*.php3-set (Import text-files) as well as
+      a bug-report. Plus many smaller improvements.
+    - Jan Legenhausen <jan@nrw.net>: He made many of the changes that were
+      introduced in 1.3.0 (including quite significant ones like the
+      authentification). For 1.4.1 he enhanced the table-dump feature. Plus
+      bug-fixes and help.
+    - Marc Delisle <DelislMa@CollegeSherbrooke.qc.ca> made phpMyAdmin language-
+      independent by outsourcing the strings to a separate file. He also
+      contributed the French translation.
+    - Alexandr Bravo <abravo@hq.admiral.ru> who contributed tbl_select.php3,
+      a feature to display only some fields from a table.
+    - Chris Jackson <chrisj@ctel.net> added support for MySQL functions in 
+      tbl_change.php3. He also added the "Query by Example" feature in 2.0.
+    - Dave Walton <walton@nordicdms.com> added support for multiple servers and
+      is a regular contributor for bug-fixes.
+    - Gabriel Ash <ga244@is8.nyu.edu> contributed the random access features
+      for 2.0.6.
+    The following people have contributed minor changes, enhancements, bugfixes
+    or support for a new language:
+    Jim Kraai, Jordi Bruguera, Miquel Obrador, Geert Lund, Thomas Kleemann, Alexander Leidinger,
+    Kiko Albiol, Daniel C. Chao, Pavel Piankov, Sascha Kettler, Joe Pruett,
+    Renato Lins, Mark Kronsbein, Jannis Hermanns, G. Wieggers.
+
+    And thanks to everyone else who sent me email with suggestions, bug-reports and
+    or just some feedback.
+</pre>
 
 
 
+<a name="bottom"></a><br>
+<hr noshade width="100%"><font size="+1">
+<a class="navigation2" href="#top">Top</a> &nbsp;-&nbsp;    
+<a class="navigation2" href="#intro">Introduction</a> &nbsp;-&nbsp;  
+<a class="navigation2" href="#setup">Installation</a> &nbsp;-&nbsp;   
+<a class="navigation2" href="#config">Configuration</a> &nbsp;-&nbsp;  
+<a class="navigation2" href="#faq">FAQ</a> &nbsp;-&nbsp;  
+<a class="navigation2" href="#developpers">Developpers</a> &nbsp;-&nbsp;   
+<a class="navigation2" href="#credits">Credits</a>
+</font><hr noshade width="100%">
 
 </body>
 </html>
