diff --git a/DEVELOPERS b/DEVELOPERS index 4929867e0..2df93a1f2 100755 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -25,6 +25,9 @@ phpMyAdmin - Developer's Information IMPORTANT: With 1.4.1, development has switched to CVS. + + Public CVS Web access: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/phpmyadmin/ + The following method is preferred for new developers: - fetch the current CVS tree over anonymous CVS: cvs -d:pserver:anonymous@cvs.phpmyadmin.sourceforge.net:/cvsroot/phpmyadmin login diff --git a/INSTALL b/INSTALL index c79569bb9..b11345582 100755 --- a/INSTALL +++ b/INSTALL @@ -22,6 +22,19 @@ phpMyAdmin - Installation in your browser. phpMyAdmin should now display a welcome screen and your databases. + Bookmarks: + To use the new bookmarks feature, you will have to create a new + db and table on your system, and to type the informations in + config.ini.php3. Table definition: + + CREATE TABLE bookmark ( + id int(11) DEFAULT '0' NOT NULL auto_increment, + dbase varchar(255) NOT NULL, + label varchar(255) NOT NULL, + query text NOT NULL, + PRIMARY KEY (id) + ); + Installation notes: + Be sure to protect the phpMyAdmin-directory. By default, it is not protected in any way! It shouldn't be readable by anyone and diff --git a/README b/README index 34c3df7a4..f39339024 100755 --- a/README +++ b/README @@ -47,6 +47,7 @@ phpMyAdmin - Readme - create and read dumps of tables - export and import CSV data - administer one single database + - communicate in more than 20 different languages Download: You can get the newest version at http://phpmyadmin.sourceforge.net/. diff --git a/defines.inc.php3 b/defines.inc.php3 index 159a1cfa8..80824ac00 100755 --- a/defines.inc.php3 +++ b/defines.inc.php3 @@ -10,7 +10,7 @@ // PMA_WINDOWS (bool) - mark if phpMyAdmin running on windows server -define("PHPMYADMIN_VERSION", "2.2.0rc1"); +define("PHPMYADMIN_VERSION", "2.2.0rc2"); if (!ereg("([0-9]).([0-9]).([0-9])", phpversion(), $match)) $result=ereg("([0-9]).([0-9])",phpversion(),$match); diff --git a/index.php3 b/index.php3 index f01d658e9..179e7a7ca 100755 --- a/index.php3 +++ b/index.php3 @@ -3,7 +3,6 @@ require('./grab_globals.inc.php3'); require('./lib.inc.php3'); - // Get the host name if (empty($HTTP_HOST)) { if (!empty($HTTP_ENV_VARS) && isset($HTTP_ENV_VARS['HTTP_HOST'])) {