From 65f59b3791de36f1aefc90ccc89703451307874b Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 31 May 2009 10:20:44 +0000
Subject: [PATCH] 3.2.0-rc1 and new address for Marc

---
 Documentation.html         | 8 ++++----
 README                     | 6 +++---
 libraries/Config.class.php | 2 +-
 translators.html           | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index 7644cedcc..6e90d5197 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -10,7 +10,7 @@
     <link rel="icon" href="./favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>phpMyAdmin 3.2.0-beta1 - Documentation</title>
+    <title>phpMyAdmin 3.2.0-rc1 - Documentation</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -18,7 +18,7 @@
 <div id="header">
     <h1>
         <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
-        3.2.0-beta1
+        3.2.0-rc1
         Documentation
     </h1>
 </div>
@@ -4250,7 +4250,7 @@ LogFormat "%h %l %u %t \"%r\" %>s %b \
 
 <pre>
 Copyright (C) 1998-2000 Tobias Ratschiller &lt;tobias_at_ratschiller.com&gt;
-Copyright (C) 2001-2008 Marc Delisle &lt;Marc.Delisle_at_cegepsherbrooke.qc.ca&gt;
+Copyright (C) 2001-2009 Marc Delisle &lt;marc_at_infomarc.info&gt;
                         Olivier Müller &lt;om_at_omnis.ch&gt;
                         Robin Johnson &lt;robbat2_at_users.sourceforge.net&gt;
                         Alexander M. Turek &lt;me_at_derrabus.de&gt;
@@ -4288,7 +4288,7 @@ CREDITS, in chronological order
     * creator of the phpmyadmin project
     * maintainer from 1998 to summer 2000
 
-- Marc Delisle &lt;Marc.Delisle_at_cegepsherbrooke.qc.ca&gt;
+- Marc Delisle &lt;marc_at_infomarc.info&gt;
     * multi-language version
     * various fixes and improvements
     * <abbr title="structured query language">SQL</abbr> analyser (most of it)
diff --git a/README b/README
index 1b53242ec..1596cd1fb 100644
--- a/README
+++ b/README
@@ -5,12 +5,12 @@ phpMyAdmin - Readme
 
   A set of PHP-scripts to manage MySQL over the web.
 
-  Version 3.2.0-beta1
-  -------------------
+  Version 3.2.0-rc1
+  -----------------
   http://www.phpmyadmin.net/
 
     Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>
-    Copyright (C) 2001-2008 Marc Delisle <Marc.Delisle_at_cegepsherbrooke.qc.ca>
+    Copyright (C) 2001-2009 Marc Delisle <marc_at_infomarc.info>
                             Olivier Müller <om_at_omnis.ch>
                             Robin Johnson <robbat2_at_users.sourceforge.net>
                             Alexander M. Turek <me_at_derrabus.de>
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 59f7c4407..d6dfb7e79 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -92,7 +92,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '3.2.0-beta1');
+        $this->set('PMA_VERSION', '3.2.0-rc1');
         /**
          * @deprecated
          */
diff --git a/translators.html b/translators.html
index 71ccd0efd..c97f59d99 100644
--- a/translators.html
+++ b/translators.html
@@ -8,7 +8,7 @@
     <link rel="icon" href="./favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>phpMyAdmin 3.2.0-beta1 - Official translators</title>
+    <title>phpMyAdmin 3.2.0-rc1 - Official translators</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -16,7 +16,7 @@
 <div id="header">
     <h1>
         <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
-        3.2.0-beta1
+        3.2.0-rc1
         official translators list
     </h1>
 </div>