From a771486c814ab93bbad39b9c179a60ca226321d2 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 5 Apr 2002 17:56:40 +0000
Subject: [PATCH] 2.2.6-rc1

---
 ChangeLog                  |   5 +-
 Documentation.html         |   4 +-
 Documentation.txt          | 318 +++++++++++++++++++------------------
 libraries/defines.lib.php3 |   2 +-
 4 files changed, 168 insertions(+), 161 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 15c8e2156..02c6fbd36 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
-2002-03-30 Loïc Chapeaux  <lolo@phpheaven.net>
+2002-04-05 Marc Delisle  <lem9@users.sourceforge.net>
+	* release 2.2.6-rc1
+
+2002-04-05 Loïc Chapeaux  <lolo@phpheaven.net>
 	* Documentation.html: updated the faq entry about maximum upload filesize
 	  and misc. updates.
 	* tbl_indexes.php3, lines 95-97: better fix for bug #538074 (MySQL alpha or
diff --git a/Documentation.html b/Documentation.html
index 5e5c8c479..b51eccd03 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -5,7 +5,7 @@
 
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-    <title>phpMyAdmin 2.2.6-dev - Documentation</title>
+    <title>phpMyAdmin 2.2.6-rc1 - Documentation</title>
     <style type="text/css">
     <!--
     .navigation {
@@ -74,7 +74,7 @@
 
 <body bgcolor="#FFFFFF">
 <a name="top"></a>
-<h1>phpMyAdmin 2.2.6-dev Documentation</h1>
+<h1>phpMyAdmin 2.2.6-rc1 Documentation</h1>
 
 
 <!-- TOP MENU -->
diff --git a/Documentation.txt b/Documentation.txt
index 176f7051e..a5349db30 100644
--- a/Documentation.txt
+++ b/Documentation.txt
@@ -1,20 +1,20 @@
 
-                      phpMyAdmin 2.2.6-dev Documentation
-
-     * Sourceforge phpMyAdmin project page    [
-       http://www.phpmyadmin.net/ ]
+                      phpMyAdmin 2.2.6-rc1 Documentation
+                                       
+     * Sourceforge phpMyAdmin project page   [ http://www.phpmyadmin.net/
+       ]
      * Local documents:
           + Version history: ChangeLog
           + General notes: README
           + License: LICENSE
-     * Documentation version: $Id: Documentation.html,v 1.183 2002/04/03
-       02:39:25 lem9 Exp $
+     * Documentation version: $Id: Documentation.html,v 1.187 2002/04/05
+       08:55:31 loic1 Exp $
    ______________________________________________________________________
-
+   
    Top  -  Requirements  -  Introduction  -  Installation  -
    Configuration  -  FAQ  -  Developers  -  Credits
    ______________________________________________________________________
-
+   
 Requirements
 
      * PHP3 or PHP4: phpMyAdmin widely uses the 'str_replace()' php
@@ -24,11 +24,11 @@ Requirements
      * MySQL (tested with 3.21.x, 3.22.x and 3.23.x);
      * a web-browser (doh!).
    ______________________________________________________________________
-
+   
    Top  -  Requirements  -  Introduction  -  Installation  -
    Configuration  -  FAQ  -  Developers  -  Credits
    ______________________________________________________________________
-
+   
 Introduction
 
    phpMyAdmin can manage a whole MySQL-server (needs a super-user) but
@@ -47,31 +47,31 @@ Introduction
      * administer multiple servers and single databases
      * check referential integrity
      * communicate in more than 38 different languages
-
+       
    (*)  phpMyAdmin can compress (Zip, GZip -RFC 1952- or Bzip2 formats)
    dumps and CSV exports if you use PHP4 >= 4.0.4 with Zlib support
    (--with-zlib) and/or Bzip2 support (--with-bz2).
    ______________________________________________________________________
-
+   
    Top  -  Requirements  -  Introduction  -  Installation  -
    Configuration  -  FAQ  -  Developers  -  Credits
    ______________________________________________________________________
-
+   
 Installation
 
    NOTE: phpMyAdmin does not apply any special security methods to the
    MySQL database server. It is still the sysadmin's job to grant
    permissions on the MySQL databases properly.
-
+   
    Warning for Mac users: php seems not to like Mac end of lines
    character ("\r") and Stuffit unstuffs with Mac formats, of course.
    So you'll have to resave as in Bbedit to unix style ALL phpMyAdmin
    scripts before uploading them to your server.
-
+   
    Documentation warning: when you see in this document a .php3 file
    extension, please transpose to .php if you are using a kit with files
    having this extension.
-
+   
    Quick Install:
     1. Use a distribution kit with the files having the extension (.php3
        or .php) depending on the way your web/PHP server interprets those
@@ -93,13 +93,13 @@ Installation
        your browser. phpMyAdmin should now display a welcome screen and
        your databases, or a login dialog if using http or cookie
        authentication mode.
-
+       
    Upgrading from an older version:
      * Please do not copy your older config.inc.php3 over the new one: it
        may offer new configuration variables, and the new version may
        depend on these for normal behavior. It is suggested instead to
        insert your site values in the new one.
-
+       
    Using authentication modes:
      * Http and cookie authentication modes are recommended in a
        multi-user environment where you want to give users access to
@@ -122,7 +122,7 @@ Installation
        $cfgServers[n]['controlpass'] settings.
        This example assumes you want to use pma as the controluser and
        pmapass as the controlpass:
-
+       
        GRANT USAGE ON mysql.* TO 'pma'@'localhost' IDENTIFIED BY
    'pmapass';
    GRANT SELECT (Host, User, Select_priv, Insert_priv, Update_priv,
@@ -145,21 +145,21 @@ Installation
        management system.
        With http or cookie auth mode, you don't need to fill the
        user/password fields inside the $cfgServers array.
-
+       
    'http' authentication mode:
      * Was called 'advanced' in versions before 2.2.3.
      * Introduced in 1.3.0, it uses Basic HTTP authentication method and
        allows you to login as any valid MySQL user.
      * Is only supported with PHP running as an Apache module, not with
        cgi.
-
+       
    'cookie' authentication mode:
      * You can use this method as a replacement for the http
        authentication (for example, if you're running IIS).
      * Obviously, the user must enable cookies in the browser.
      * With this mode, the use can truly logout of phpMyAdmin and login
        back with the same username.
-
+       
    'config' authentication mode:
      * This mode is the less secure one because it requires you to fill
        the $cfgServers[n]['user'] and $cfgServers[n]['password'] fields.
@@ -168,20 +168,20 @@ Installation
        In the ISP FAQ section, there is an entry explaining how to
        protect your configuration file.
    ______________________________________________________________________
-
+   
    Top  -  Requirements  -  Introduction  -  Installation  -
    Configuration  -  FAQ  -  Developers  -  Credits
    ______________________________________________________________________
-
+   
 Configuration
 
    Warning for Mac users: php seems not to like Mac end of lines
    character ("\r"). So ensure you choose the option that allows to use
    the *nix end of line character ("\n") in your text editor before
    registering a script you have modified.
-
+   
    All configurable data is placed in config.inc.php3.
-
+   
    $cfgPmaAbsoluteUri string
           Sets here the complete url (with full path) to your phpMyAdmin
           version. E.g.
@@ -189,7 +189,7 @@ Configuration
           Don't forget the slash at the end of your url.
           This setting can be dynamically completed. For example, you can
           try to use such a kind of code:
-
+          
 $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://'
                    . $SERVER_NAME . (!empty($SERVER_PORT) ? ':' . $SERVER_PORT
 : '')
@@ -204,24 +204,24 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://'
           first server, $cfgServers[2]['host'] the hostname of the second
           server, etc. If you have only one server to administer, simply
           leave free the hostname of the other $cfgServer-entries.
-
+          
    $cfgServers[n]['host'] string
           The hostname of your n-th MySQL-server. E.g. localhost.
-
+          
    $cfgServers[n]['port'] string
           The port-number of your n-th MySQL-server. Default is 3306
           (leave blank).
-
+          
    $cfgServers[n]['socket'] string
           The path to the socket to use. Leave blank for default.
           To use the socket feature you must run php 3.0.10 or more.
-
+          
    $cfgServers[n]['connect_type'] string
           What type connection to use with the MySQL server. Your options
           are 'socket' & 'tcp'. It defaults to 'tcp' as that is nearly
           guarenteed to be available on all MySQL servers, while sockets
           are not supported on some platforms.
-
+          
    $cfgServers[n]['controluser'] string
           $cfgServers[n]['controlpass'] string
           When using http or cookie authentication modes (or 'config'
@@ -238,11 +238,11 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://'
           privileges you gave to the "controluser". phpMyAdmin does not
           support a direct login with the "controluser".
           In versions before 2.2.5, those were called "stduser/stdpass".
-
+          
    $cfgServers[n]['auth_type'] string ['http'|'cookie'|'config']
           Whether config or cookie or http authentication should be used
           for this server.
-
+          
           + 'config' authentication ($auth_type = 'config') is the plain
             old way: username and password are stored in config.inc.php3.
           + 'cookie' authentication mode ($auth_type = 'cookie') as
@@ -253,16 +253,16 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://'
           + 'http' authentication (was called 'advanced' in older
             versions) ($auth_type = 'http') as introduced in 1.3.0 allows
             you to log in as any valid MySQL user via HTTP-Auth.
-
+            
           Please see the install section on "Using authentication modes"
           for more information.
-
+          
    $cfgServers[n]['user'] string
           $cfgServers[n]['password'] string
           The user/password-pair which phpMyAdmin will use to connect to
           this MySQL-server. This user/password pair is not needed when
           http or cookie authentication is used, and should be empty.
-
+          
    $cfgServers[n]['only_db'] string or array
           If set to a(an array of) database name(s), only this(these)
           database(s) will be shown to the user. Since phpMyAdmin 2.2.1,
@@ -276,20 +276,20 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://'
           privileges rules of the MySQL database server. If set, it just
           means only these databases will be displayed but not at all
           other databases can't be used.
-
+          
    $cfgServers[n]['verbose'] string
           Only useful when using phpMyAdmin with multiple server entries.
           If set, this string will be displayed instead of the hostname
           in the pulldown menu on the main page. This can be useful if
           you want to show only certain databases on your system, for
           example.
-
+          
    $cfgServers[n]['bookmarkdb'] string
           $cfgServers[n]['bookmarktable'] string
           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:
-
+          
           + create a table following this scheme:
                  CREATE TABLE bookmark (
                    id int(11) DEFAULT '0' NOT NULL auto_increment,
@@ -303,27 +303,27 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://'
             and $cfgServers[n]['bookmarktable'] with the database and
             table names you've choosen so phpMyAdmin will be able to find
             the bookmarks.
-
+            
           Note that controluser must have SELECT, INSERT and DELETE
           privileges on the bookmark table. Here is a query to set up
           those privileges (using "pma" as the controluser:
           GRANT SELECT,INSERT,DELETE ON <bookmarkdb>.<bookmarktable> to
           'pma'@localhost;
-
+          
    $cfgServers[n]['relation'] string
           Since release 2.2.4 you can describe, in a special 'relation'
           table, which field is a key in another table (a foreign key).
           phpMyAdmin currently uses this to
-
+          
           + make clickable, when you browse the src table, the data
             values that point to the dest table;
           + display links on the table properties page, to check
             referential integrity (display missing foreign keys) for each
             described key.
-
+            
           The keys can be numeric or character.
           To use this functionality you have to:
-
+          
           + create in the same database a table (for example 'relation')
             following this scheme:
                  CREATE TABLE `relation` (
@@ -336,7 +336,7 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://'
           + put the relation table name in $cfgServers[n]['relation']
           + then manually fill the relation table with information about
             the keys.
-
+            
    $cfgServerDefault integer
           If you have more than one server configured, you can set
           $cfgServerDefault to any one of them to autoconnect to that
@@ -344,48 +344,48 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://'
           list of servers without logging in.
           If you have only one server configured, $cfgServerDefault MUST
           be set to that server.
-
+          
    $cfgOBGzip boolean
           Defines whether to use gzip output buffering for increased
           speed in HTTP transfers.
-
+          
    $cfgPersistentConnections boolean
           Whether persistent connections should be used or not
           (mysql_connect or mysql_pconnect).
-
+          
    $cfgExecTimeLimit integer [number of seconds]
           Set the number of seconds a script is allowed to run. If
           seconds is set to zero, no time limit is imposed.
           This setting is used while importing/exporting dump files but
           has no effect when PHP is running in safe mode.
-
+          
    $cfgSkipLockedTables boolean
           Mark used tables and make it possible to show databases with
           locked tables (since 3.23.30).
-
+          
    $cfgShowSQL boolean
           Defines whether sql-queries generated by phpMyAdmin should be
           displayed or not.
-
+          
    $cfgAllowUserDropDatabase boolean
           Defines whether normal users (non-administrator) are allowed to
           delete their own database or not. If set as FALSE, the link
           "Drop Database" will not be shown, and even a "DROP DATABASE
           mydatabase" will be rejected. Quite practical for ISP's with
           many customers.
-
+          
    $cfgConfirm boolean
           Whether a warning ("Are your really sure..") should be
           displayed when you're about to loose data.
-
+          
    $cfgShowTooltip boolean
           Defines whether to display table comment as tooltip in left
           frame or not.
-
+          
    $cfgLeftFrameLight boolean
           Defines whether to use select-based menu and display only the
           current tables in the left frame (smaller page).
-
+          
    $cfgShowMysqlInfo boolean
           $cfgShowMysqlVars boolean
           $cfgShowPhpInfo boolean
@@ -402,41 +402,41 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://'
           effect with "config" authentication mode: because of the hard
           coded password value in the configuration file, end users can't
           be allowed to change their passwords.
-
+          
    $cfgLoginCookieRecall boolean
           Define whether the previous login should be recalled or not in
           cookie authentication mode.
-
+          
    $cfgShowStats boolean
           Defines whether to display space usage and statistics about
           databases and tables or not.
           Note that statistics requires at least MySQL 3.23.3 and that,
           at this date, MySQL doesn't return such information for
           Berkeley DB tables.
-
+          
    $cfgShowBlob boolean
           Defines whether BLOB fields are shown when browsing a table's
           content or not.
-
+          
    $cfgNavigationBarIconic boolean
           Defines whether navigation bar buttons contain text or symbols
           only.
-
+          
    $cfgShowAll boolean
           Defines whether an user should be displayed a "show all
           (records)" button in browse mode or not.
-
+          
    $cfgMaxRows integer
           Number of rows displayed when browsing a resultset. If the
           resultset contains more rows, Previous/Next links will be
           shown.
-
+          
    $cfgOrder string [DESC|ASC|SMART]
           Defines whether fields are displayed in ascending (ASC) order,
           in descending (DESC) order or in a "smart" (SMART) order -ie
           descending order for fields of type TIME, DATE, DATETIME &
           TIMESTAMP, ascending order else- by default.
-
+          
    $cfgProtectBinary boolean or string
           Defines whether BLOB or BINARY fields are protected from
           edition when browsing a table's content or not. Valid values
@@ -444,54 +444,54 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://'
           - FALSE to allow edition of all fields;
           - blob to allow edition of all fields except BLOBS;
           - all to disallow edition of all BINARY or BLOB fields.
-
+          
    $cfgShowFunctionFields boolean
           Defines whether MySQL functions fields should be displayed or
           not in edit/insert mode.
-
+          
    $cfgZipDump boolean
           $cfgGZipDump boolean
           $cfgBZipDump boolean
           Defines whether to allow the use of zip/gzip/bzip compression
           when creating a dump file or not.
-
+          
    $cfgManualBaseShort string
           If set to an URL which points to the MySQL documentation (on
           short pages), appropriate help links are generated.
-
+          
    $cfgDefaultLang string
           Defines the default language to use, if not browser-defined or
           user-defined.
           See the select_lang.inc.php3 script to know the valid values
           for this setting.
-
+          
    $cfgLang string
           Force: always use this language (must be defined in the
           select_lang.inc.php3 script).
-
+          
    $cfgLeftWidth integer
           Left frame width in pixel.
-
+          
    $cfgLeftBgColor string [HTML color]
           $cfgRightBgColor string [HTML color]
           The background colors (HTML) used for both the frames.
-
+          
    $cfgLeftPointerColor string [HTML color]
           The color (HTML) used for the pointer in the left frame (does
           not work with NS4).
-
+          
    $cfgBorder integer
           The size of a table's border.
-
+          
    $cfgThBgcolor string [HTML color]
           The color (HTML) used for table headers.
-
+          
    $cfgBgcolorOne string [HTML color]
           The color (HTML) #1 for table rows.
-
+          
    $cfgBgcolorTwo string [HTML color]
           The color (HTML) #2 for table rows.
-
+          
    $cfgBrowsePointerColor string [HTML color]
           $cfgBrowseMarkerColor string [HTML color]
           The colors (HTML) used for the pointer and the marker in browse
@@ -501,51 +501,51 @@ $cfgPmaAbsoluteUri = (!empty($HTTPS) ? 'https' : 'http') . '://'
           clicking on them.
           You can disable both of these features by emptying the
           convenient directive.
-
+          
    $cfgTextareaCols integer
           $cfgTextareaRows integer
           Number of columns and rows for the textareas.
-
+          
    $cfgLimitChars integer
           Maximal number of Chars showed in a TEXT OR a BLOB field on
           browse view. Can be turned off by a toggle button on the browse
           page.
-
+          
    $cfgModifyDeleteAtLeft boolean
           $cfgModifyDeleteAtRight boolean
           Defines the place where modify and delete links would be put
           when tables contents are displayed (you may have them displayed
           both at the left and at the right). "Left" and "right" are
           parsed as "top" and "bottom" with vertical display mode.
-
+          
    $cfgDefaultDisplay string
           There are 2 display modes: horizontal and vertical. Define
           which one is displayed by default.
-
+          
    $cfgRepeatCells integer
           Repeat the headers every X cells, or 0 to deactivate.
-
+          
    $cfgColumnTypes array
           All possible types of a MySQL column. In most cases you don't
           need to edit this.
-
+          
    $cfgAttributeTypes array
           Possible attributes for fields. In most cases you don't need to
           edit this.
-
+          
    $cfgFunctions array
           A list of functions MySQL supports. In most cases you don't
           need to edit this.
    ______________________________________________________________________
-
+   
    Top  -  Requirements  -  Introduction  -  Installation  -
    Configuration  -  FAQ  -  Developers  -  Credits
    ______________________________________________________________________
-
+   
 FAQ - Frequently Asked Questions
 
   [Server]
-
+  
    I'm running php 4+ and my server is crashing each time a specific
    action is required or phpMyAdmin sends a blank page or a page full of
    cryptic characters to my browser, what can I do?
@@ -553,21 +553,21 @@ FAQ - Frequently Asked Questions
    Try to set the $cfgOBGzip directive to FALSE in your config.inc.php or
    .php3 file and the zlib.output_compression directive to Off in your
    php configuration file.
-
+   
    My Apache server crashes when using phpMyAdmin.
    You should first try the latest versions of Apache (and possibly
    MySQL).
    See also the other FAQ entry about php bugs with output buffering.
    If your server keeps crashing, please ask for help in the various
    Apache support groups.
-
+   
    Using phpMyAdmin on IIS, I'm displayed the error message: "The
    specified CGI application misbehaved by not returning a complete set
    of HTTP headers...."
    You just forgot to read the install.txt file from the php
    distribution. Have a look at the last message in this bug report from
    the official php bug database.
-
+   
    Using phpMyAdmin on IIS, I'm facing crashes and/or many error messages
    with the http or advanced authentication mode.
    This is a known problem with the php ISAPI filter: it's not so stable.
@@ -575,19 +575,19 @@ FAQ - Frequently Asked Questions
    posted by André B. aka "djdeluxe76" in this thread from the phpWizard
    forum.
    Please use instead the cookie authentication mode.
-
+   
    I can't use phpMyAdmin on PWS: nothing is displayed!
    This seems to be a PWS bug. Filippo Simoncini found a workaroud (at
    this time there is no better fix): remove or comment the DOCTYPE
    declarations (3 lines) from the scripts header.inc.php3, index.php3,
    left.php3 and libraries/common.lib.php3.
-
+   
    How can I GZip or Bzip a dump or a CSV export. It seems to not work?
    These features are based on the gzencode() and bzcompress() php
    functions to be more independent of the platform (Unix/Windows, Safe
    Mode or not, and so on). So, you must have PHP4 >= 4.0.4 and
    Zlib/Bzip2 support (--with-zlib and --with-bz2).
-
+   
    I cannot insert a text file in a table, and I get an error about safe
    mode being in effect.
    Your uploaded file is saved by PHP in the "upload dir", as defined in
@@ -601,7 +601,7 @@ FAQ - Frequently Asked Questions
      * give proper permission: chmod 600 /tmp/php
      * put upload_tmp_dir = /tmp/php in php.ini
      * restart Apache
-
+       
    I'm having troubles when uploading files. In general file uploads
    don't work on my system and uploaded files have a Content-Type: header
    in the first line.
@@ -616,7 +616,7 @@ FAQ - Frequently Asked Questions
    So please download the fixed package (4.0.4pl1-9) and the problem
    should go away.
    And that fixes the \r\n problem with file uploads!
-
+   
    I'm having troubles when uploading files with phpMyAdmin running on a
    secure server. My browser is Internet Explorer and I'm using the
    Apache server.
@@ -624,7 +624,7 @@ FAQ - Frequently Asked Questions
    httpd.conf:
        SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
    It seems to clear up many problems between IE and SSL.
-
+   
    I get an 'open_basedir restriction' while uploading a file from the
    query box.
    Since version 2.2.4, phpMyAdmin supports servers with open_basedir
@@ -634,42 +634,45 @@ FAQ - Frequently Asked Questions
    and the same owner as the owner of your phpMyAdmin directory. The
    uploaded files will be moved there, and after execution of your SQL
    commands, removed.
-
+   
    I have lost my MySQL root password, what can I do?
    The MySql manual explains how to reset the permissions.
-
+   
    I get an error 'No SQL query' when trying to execute a bookmark.
    If PHP does not have read/write access to its upload_tmp_dir, it
    cannot access the uploaded query.
-
+   
    I get an error 'No SQL query' when trying to submit a query from the
    convenient text area.
    Check the post_max_size directive from your php configuration file and
    try to increase it.
-
+   
    I have problems with mysql.user field names.
    In older MySQL versions, the User and Password fields were named user
    and password. Please modify your field names to align with current
    standards.
-
+   
    I cannot upload big dump files.
-   The first thing to check (or ask your host provider to check) is the
-   value of upload_max_filesize in php.ini.
-
+   The first things to check (or ask your host provider to check) are the
+   values of upload_max_filesize, memory_limit and post_max_size in the
+   php.ini configuration file.
+   All of these three settings limit the maximum size of data that can be
+   submitted and handled by php.
+   
   [Configuration]
-
+  
    The error message "Warning: Cannot add header information - headers
    already sent by ..." is displayed, what's the problem?
    Edit your config.inc.php or .php3 file and ensure there is nothing (ie
    no blank lines, no spaces, no characters...) neither before the <?php
    tag at the beginning, neither after the ?> tag at the end.
-
+   
    phpMyAdmin can't connect to MySQL. What's wrong?
    Either there is an error with your PHP setup or your username/password
    is wrong. Try to make a small script which uses mysql_connect and see
    if it works. If it doesn't, it may be you haven't even compiled MySQL
    support into PHP.
-
+   
    The error message "Warning: MySQL Connection Failed: Can't connect to
    local MySQL server through socket '/tmp/mysql.sock' (111)...") is
    displayed. What can I do?
@@ -693,10 +696,10 @@ FAQ - Frequently Asked Questions
        phpMyAdmin, you need to complete the socket information in the
        config.inc.php3.
        For example: $cfgServers[n]['socket'] = '/tmp/mysql.sock';
-
+       
    Have also a look at the corresponding section of the MySQL
    documentation.
-
+   
    Nothing is displayed by my browser when I try to run phpMyAdmin, what
    can I do?
    Try to set the $cfgOBGZip directive to FALSE in the phpMyAdmin
@@ -704,15 +707,15 @@ FAQ - Frequently Asked Questions
    Also have a look at your php version number: if it contains "4.0b..."
    it means you're running a beta version of PHP. That's not a so good
    idea, please upgrade to a plain revision.
-
+   
    Each time I want to insert or change a record or drop a database or a
    table, an error 404 (page not found) is displayed or, with http or
    cookie authentication, I'm asked to login again. What's wrong?
    Check the value you set for the $cfgPmaAbsoluteUri directive in the
    phpMyAdmin configuration file.
-
+   
   [Known limitations]
-
+  
    When using http authentication, an user who logged out can not relog
    in with the same nick.
    This is related to the authentication mechanism (protocol) used by
@@ -720,7 +723,7 @@ FAQ - Frequently Asked Questions
    time to do it, but you can bypass this problem: just close all the
    opened browser windows and then go back to phpMyAdmin. You should be
    able to logs in again.
-
+   
    When dumping a large table in compressed mode, I get a memory limit
    error or a time limit error.
    As of version 2.2.4, we build the compressed dump in memory, so large
@@ -728,9 +731,9 @@ FAQ - Frequently Asked Questions
    system calls to mysqldump then gzip or bzip2) would not be applicable
    in environments where PHP is in safe mode: access to system programs
    is is limited by the system administrator, and time limit is enforced.
-
+   
   [ISPs, multi-user installations ]
-
+  
    I'm an ISP. Can I setup one central copy of phpMyAdmin or do I need to
    install it for each customer?
    Since version 2.0.3, you can setup a central copy of phpMyAdmin for
@@ -738,7 +741,7 @@ FAQ - Frequently Asked Questions
    by NetCologne GmbH. This requires a properly setup MySQL user
    management and phpMyAdmin http authentication. See the install section
    on "Using http authentication".
-
+   
    What's the preferred way of making phpMyAdmin secure against evil
    access?
    This depends on your system.
@@ -754,12 +757,12 @@ FAQ - Frequently Asked Questions
        the group under which Apache runs.
      * You should use PHP safe mode, to protect from other users that try
        to include your config.inc.php3 in their scripts.
-
+       
    I get errors about not being able to include a file in /lang
    Check php.ini, or ask your sysadmin to check it. The include_path must
    contain "." somewhere in it, and open_basedir, if used, must contain
    "." and "./lang" to allow normal operation of phpMyAdmin.
-
+   
    phpMyAdmin always gives "Access denied" when using http
    authentication.
    This could happen for several reasons:
@@ -769,27 +772,27 @@ FAQ - Frequently Asked Questions
      * You have already setup a security mechanism for the
        phpMyAdmin-directory, eg. a .htaccess file. This would interfere
        with phpMyAdmin's authentication, so remove it.
-
+       
    Is it possible to let users create their own databases?
    Starting with 2.2.5, in the user management page, you can enter a
    wildcard database name for a user, and put the privileges you want.
    For example, adding SELECT, INSERT, UPDATE, DELETE, CREATE, DROP,
    INDEX, ALTER would let a user create/manage his/her database(s).
-
+   
   [Browsers or client OS]
-
+  
    I get an out of memory error, and my controls are non-functional, when
    trying to create a table with more than 14 fields.
    We could reproduce this problem only under Win98/98SE. Testing under
    WinNT4 or Win2K, we could easily create more than 60 fields.
    A workaround is to create a smaller number of fields, then come back
    to your table properties and add the other fields.
-
+   
    With Xitami 2.5b4, phpMyAdmin won't process form fields.
    This is not a phpMyAdmin problem but a Xitami known bug: you'll face
    it with each script/website that use forms.
    Upgrade or downgrade your Xitami server.
-
+   
    I have problems dumping tables with Konqueror (phpMyAdmin 2.2.2)
    With Konqueror 2.1.1: plain dumps, zip and gzip dumps work ok, except
    that the proposed file name for the dump is always 'tbl_dump.php'.
@@ -798,7 +801,7 @@ FAQ - Frequently Asked Questions
    user's temporary directory, so they must be moved before closing
    Konqueror, or else they disappear. Gzip dumps give an error message.
    Testing needs to be done for Konqueror 2.2.2.
-
+   
    I can't use the cookie authentication mode because Internet Explorer
    never stores the cookies.
    MS Internet Explorer seems to be really buggy about cookies, at least
@@ -806,11 +809,11 @@ FAQ - Frequently Asked Questions
    4.1.1 bug in this area!
    Then, If you're running php 4.1.1, try to upgrade or downgrade... it
    may works!
-
+   
    In Internet Explorer 5.0, I get Javascript errors when browsing my
    rows.
    Upgrade to at least Internet Explorer 5.5SP2.
-
+   
    In Internet Explorer 5.0, 5.5 or 6.0, I get an error when trying to
    modify a row in a table with many fields, or with a text field.
    Your table neither have a primary key nor an unique one, so we must
@@ -818,58 +821,59 @@ FAQ - Frequently Asked Questions
    the URL in those browsers, and this not happen in Netscape, for
    example. The workaround is to create a primary or unique key, or use
    another browser.
-
+   
    I refresh (reload) my browser, and come back to the welcome page.
    Some browsers support right-clicking into the frame you want to
    refresh, just do this in the right frame.
-
+   
    With Mozilla 0.9.7 I have problems sending a query modified in the
    query box.
    Looks like a Mozilla bug: 0.9.6 was ok. We will keep an eye on future
    Mozilla versions.
-
+   
   [Using phpMyAdmin]
-
+  
    I can't insert new rows into a table - MySQL brings up a SQL-error.
    Examine the SQL error with care. I've found that many programmers
    specifying a wrong field-type.
    Common errors include:
      * Using VARCHAR without a size argument
      * Using TEXT or BLOB with a size argument
-
+       
    Also, look at the syntax chapter in the MySQL manual to confirm that
    your syntax is correct.
-
+   
    When I create a table, I click the Index checkbox for 2 fields and
    phpMyAdmin generates only one index with those 2 fields.
    In phpMyAdmin 2.2.0 and 2.2.1, this is the way to create a
    multi-fields index. If you want two indexes, create the first one when
    creating the table, save, then display the table properties and click
    the Index link to create the other index.
-
+   
    How can I insert a null value into my table?
    Since version 2.2.3, you have a checkbox for each field that can be
    null. Before 2.2.3, you had to enter "null", without the quotes, as
    the field's value.
-
+   
   [phpMyAdmin project]
-
+  
    I have found a bug. How do I inform developers?
    Our Bug Tracker is located at
    http://sourceforge.net/projects/phpmyadmin/ under the Bugs section.
    But please first discuss your bug with other users:
    http://sourceforge.net/projects/phpmyadmin/ (and choose Forums)
-
+   
    I want to translate the messages to a new language or upgrade an
    existing language, where do I start?
    Always use the current cvs version of your language file. For a new
    language, start from english.inc.php3. If you don't know how to get
-   the cvs version, please ask one of the developers. It would be a good
-   idea to subscribe to the phpmyadmin-translators discussion list,
-   because this is where we ask for translations of new messages. You can
-   then send your translations to the sourceforge.net translation
-   tracker.
-
+   the cvs version, please ask one of the developers.
+   You can then put your translations, as a zip file to avoid losing
+   special characters, on the sourceforge.net translation tracker.
+   It would be a good idea to subscribe to the phpmyadmin-translators
+   mailing list, because this is where we ask for translations of new
+   messages.
+   
    I would like to help out with the development of phpMyAdmin. How
    should I proceed?
    The following method is preferred for new developers:
@@ -885,31 +889,31 @@ FAQ - Frequently Asked Questions
      * add your stuff
      * put the modified files (tar'ed and gzip'ed) inside the patch
        tracker of the phpMyAdmin SourceForge account.
-
+       
    Write access to the CVS tree is granted only to experienced developers
    who have already contributed something useful to phpMyAdmin.
    Also, have a look at the Developers section.
    ______________________________________________________________________
-
+   
    Top  -  Requirements  -  Introduction  -  Installation  -
    Configuration  -  FAQ  -  Developers  -  Credits
    ______________________________________________________________________
-
+   
 Developers Information
 
    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.
-
+   
    If you're planning to contribute source, please read the following
    information:
      * All files include header.inc.php3 (layout),
        libraries/common.lib.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 libraries/lib.inc.php3
-       and more specific ones may be added within a library stored into
-       the libraries sub-directory.
+       Commonly used functions should be added to
+       libraries/common.lib.php3 and more specific ones may be added
+       within a library stored into the libraries sub-directory.
      * 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.
@@ -922,7 +926,7 @@ Developers Information
        string (at least) to english.inc.php3 and print() it out.
      * If you want to be really helpful, write an entry for the
        ChangeLog.
-
+       
    IMPORTANT: With 1.4.1, development has switched to CVS. The following
    method is preferred for new developers:
      * fetch the current CVS tree over anonymous CVS:
@@ -938,17 +942,17 @@ Developers Information
      * put the modified files (tar'ed and gzip'ed) inside the patch
        tracker of the phpMyAdmin SourceForge account
        (http://sourceforge.net/projects/phpmyadmin/)
-
+       
    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.
    ______________________________________________________________________
-
+   
    Top  -  Requirements  -  Introduction  -  Installation  -
    Configuration  -  FAQ  -  Developers  -  Credits
    ______________________________________________________________________
-
+   
 Credits
 
 
@@ -1034,7 +1038,7 @@ Kristof Hamann, Thomas Kl
 Girish Nair, David Nordenberg, Bernard M. Piller, Laurent Haas,
 "Sakamoto", Yuval Sarna, www.securereality.com.au,
 Alvar Soome, Peter Svec, Michael Tacelosky, Rachim Tamsjadi,
-Luís V., Algis Vainauskas, Daniel Villanueva, Vinay,
+Luís V., Martijn W. van der Lee, Algis Vainauskas, Daniel Villanueva, Vinay,
 Ignacio Vazquez-Abrams, Chee Wai, Jakub Wilk, Thomas Michael Winningham.
 
 
@@ -1078,9 +1082,9 @@ Original Credits of Version 2.1.0
     And thanks to everyone else who sent me email with suggestions, bug-reports
     and or just some feedback.
    ______________________________________________________________________
-
+   
    Top  -  Requirements  -  Introduction  -  Installation  -
    Configuration  -  FAQ  -  Developers  -  Credits
    ______________________________________________________________________
-
+   
                                         Valid XHTML 1.0!      Valid CSS! 
diff --git a/libraries/defines.lib.php3 b/libraries/defines.lib.php3
index 900b6239b..e355048e9 100644
--- a/libraries/defines.lib.php3
+++ b/libraries/defines.lib.php3
@@ -16,7 +16,7 @@
  */
 // phpMyAdmin release
 if (!defined('PMA_VERSION')) {
-    define('PMA_VERSION', '2.2.6-dev');
+    define('PMA_VERSION', '2.2.6-rc1');
 }
 
 // php version
