[phpwiki-checkins] CVS: phpwiki/lib config.php,1.24.2.6,1.24.2.7

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv31853/lib

Modified Files:
      Tag: release-1_2-branch
	config.php 
Log Message:
SF patch #479791 by Carsten Klapp:
Improvements to the mysql installation documentation.



Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.24.2.6
retrieving revision 1.24.2.7
diff -C2 -r1.24.2.6 -r1.24.2.7
*** config.php	2001/11/08 23:15:43	1.24.2.6
--- config.php	2001/11/09 03:13:00	1.24.2.7
***************
*** 85,88 ****
--- 85,105 ----
     // MySQL settings -- see INSTALL.mysql for details on using MySQL
     } elseif ($WhichDatabase == 'mysql') {
+       // MySQL server host:
+       $mysql_server = 'localhost';
+ 
+       // username as used in step 2 of INSTALL.mysql:
+       $mysql_user = 'wikiuser';
+ 
+       // password of above user (or leave blank if none):
+       $mysql_pwd = '';
+ 
+       // name of the mysql database
+       //  (this used to default to 'wiki' prior to phpwiki-1.2.2)
+       $mysql_db = 'phpwiki';
+ 
+       // Names of the tables.
+       // You probably don't need to change these.  If you do change
+       // them you will also have to make corresponding changes in
+       // schemas/schema.mysql before you initialize the database.
        $WikiPageStore = "wiki";
        $ArchivePageStore = "archive";
***************
*** 90,97 ****
        $WikiScoreStore = "wikiscore";
        $HitCountStore = "hitcount";
!       $mysql_server = 'localhost';
!       $mysql_user = 'root';
!       $mysql_pwd = '';
!       $mysql_db = 'wiki';
        include "lib/mysql.php";
  
--- 107,111 ----
        $WikiScoreStore = "wikiscore";
        $HitCountStore = "hitcount";
! 
        include "lib/mysql.php";