From ef3f2b5a6958412943bc02cdee5cfa1468f37215 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Wed, 18 Jul 2007 16:13:58 +0000
Subject: [PATCH] version numbers for QA_2_11 and trunk

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

diff --git a/ChangeLog b/ChangeLog
index 866f772c2..95a8539fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@ phpMyAdmin - ChangeLog
 $Id$
 $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $
 
+2.11.0.0 (not yet released)
+
 + [import] support handling of DELIMITER to mimic mysql CLI, thanks to fb1
 + improved PHP 6 compatibility
 - bug #1674914 [structure] changing definition of a TIMESTAMP field
diff --git a/Documentation.html b/Documentation.html
index 6909e8abf..ca609bbb5 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -11,7 +11,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=iso-8859-1" />
-    <title>phpMyAdmin 2.11.0-dev - Documentation</title>
+    <title>phpMyAdmin 3.0.0-dev - Documentation</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -33,7 +33,7 @@
     <li><a href="#glossary">Glossary</a></li>
 </ul>
 
-<h1>phpMyAdmin 2.11.0-dev Documentation</h1>
+<h1>phpMyAdmin 3.0.0-dev Documentation</h1>
 
 <ul><li><a href="http://www.phpmyadmin.net/">
             phpMyAdmin homepage</a></li>
@@ -56,15 +56,13 @@
 <h2 id="require">Requirements</h2>
 
 <ul><li><b>PHP</b>
-        <ul><li>You need PHP 4.1.0 or newer, with <tt>session</tt> support
+        <ul><li>You need PHP 5.2.0 or newer, with <tt>session</tt> support
                 (<a href="#faq1_31">see
                 <abbr title="Frequently Asked Questions">FAQ</abbr> 1.31</a>)
                 </li>
             <li>You need GD2 support in PHP to display inline
                 thumbnails of JPEGs (&quot;image/jpeg: inline&quot;) with their
                 original aspect ratio</li>
-            <li>You need PHP 4.3.0 or newer to use the
-                &quot;text/plain: external&quot;  MIME-based transformation</li>
             <li>When using the &quot;cookie&quot;
                 <a href="#authentication_modes">authentication method</a>, the
                 <a href="http://www.php.net/mcrypt"><tt>mcrypt</tt></a> extension
@@ -74,7 +72,7 @@
             </li>
         </ul>
     </li>
-    <li><b>MySQL</b> 3.23.32 or newer (<a href="#faq1_17">details</a>);</li>
+    <li><b>MySQL</b> 5.0 or newer (<a href="#faq1_17">details</a>);</li>
     <li><b>Web browser</b> with cookies enabled.</li>
 </ul>
 
diff --git a/README b/README
index c3bf3b8b2..f5692456e 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ phpMyAdmin - Readme
 
   A set of PHP-scripts to manage MySQL over the web.
 
-  Version 2.11.0-dev
+  Version 3.0.0-dev
   ------------------
   http://www.phpmyadmin.net/
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index c3aa3533c..4a463c421 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -85,7 +85,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '2.11.0-dev');
+        $this->set('PMA_VERSION', '3.0.0-dev');
         /**
          * @deprecated
          */
diff --git a/translators.html b/translators.html
index de762d26e..1c86c7936 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=iso-8859-1" />
-    <title>phpMyAdmin 2.11.0-dev - Official translators</title>
+    <title>phpMyAdmin 3.0.0-dev - Official translators</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -31,7 +31,7 @@
     <li><a href="Documentation.html#glossary">Glossary</a></li>
 </ul>
 
-<h1>phpMyAdmin 2.11.0-dev official translators list</h1>
+<h1>phpMyAdmin 3.0.0-dev official translators list</h1>
 
 <p> Here is the list of the &quot;official translators&quot; of
     phpMyAdmin.</p>