cvs: php-wiki-web /dokuwiki/conf dokuwiki.php local.php

lsmith Sun Jun 22 11:51:05 2008 UTC Modified files: /php-wiki-web/dokuwiki/conf dokuwiki.php local.php Log: - moved all custom settings from dokuwiki.php to local.php http://cvs.php.net/viewvc.cgi/php-wiki-web/dokuwiki/conf/dokuwiki.php?r1=1.4&r2=1.5&diff_format=u Index: php-wiki-web/dokuwiki/conf/dokuwiki.php diff -u php-wiki-web/dokuwiki/conf/dokuwiki.php:1.4 php-wiki-web/dokuwiki/conf/dokuwiki.php:1.5 --- php-wiki-web/dokuwiki/conf/dokuwiki.php:1.4 Tue Jun 17 13:59:20 2008 +++ php-wiki-web/dokuwiki/conf/dokuwiki.php Sun Jun 22 11:51:05 2008 @@ -24,8 +24,8 @@ /* Display Options */ $conf['start'] = 'start'; //name of start page -$conf['title'] = 'PHP Wiki'; //what to show in the title -$conf['template'] = 'phpwiki'; //see tpl directory +$conf['title'] = 'DokuWiki'; //what to show in the title +$conf['template'] = 'default'; //see tpl directory $conf['fullpath'] = 0; //show full path of the document or relative to datadir only? 0|1 $conf['recent'] = 20; //how many entries to show in recent $conf['breadcrumbs'] = 10; //how many recent visited pages to show @@ -60,7 +60,7 @@ $conf['useacl'] = 0; //Use Access Control Lists to restrict access? $conf['autopasswd'] = 1; //autogenerate passwords and email them to user -$conf['authtype'] = 'phpcvs'; //which authentication backend should be used +$conf['authtype'] = 'plain'; //which authentication backend should be used $conf['passcrypt'] = 'smd5'; //Used crypt method (smd5,md5,sha1,ssha,crypt,mysql,my411) $conf['defaultgroup']= 'user'; //Default groups new Users are added to $conf['superuser'] = '!!not set!!'; //The admin can be user or @group or comma separated list user1,@group1,user2 @@ -108,7 +108,7 @@ // 'page' - the revised page itself // 'rev' - page showing all revisions // 'current' - most recent revision of page -$conf['rss_content'] = 'htmldiff'; // what to put in the items by deafult? +$conf['rss_content'] = 'abstract'; // what to put in the items by deafult? // 'abstract' - plain text, first paragraph or so // 'diff' - plain text unified diff wrapped in <pre> tags // 'htmldiff' - diff as HTML table @@ -143,3 +143,4 @@ $conf['ftp']['user'] = 'user'; $conf['ftp']['pass'] = 'password'; $conf['ftp']['root'] = '/home/user/htdocs'; + http://cvs.php.net/viewvc.cgi/php-wiki-web/dokuwiki/conf/local.php?r1=1.3&r2=1.4&diff_format=u Index: php-wiki-web/dokuwiki/conf/local.php diff -u php-wiki-web/dokuwiki/conf/local.php:1.3 php-wiki-web/dokuwiki/conf/local.php:1.4 --- php-wiki-web/dokuwiki/conf/local.php:1.3 Sun Jun 22 10:10:54 2008 +++ php-wiki-web/dokuwiki/conf/local.php Sun Jun 22 11:51:05 2008 @@ -8,7 +8,6 @@ umask(0775); -$conf['title'] = 'PHP Wiki'; $conf['useacl'] = 1; $conf['superuser'] = '@admin'; $conf['manager'] = '@phpcvs'; @@ -20,6 +19,10 @@ $conf['send404'] = 1; $conf['plugin']['hcalendar']['locale'] = 'en_US'; $conf['updatecheck'] = 0; +$conf['rss_content'] = 'htmldiff'; +$conf['title'] = 'PHP Wiki'; +$conf['template'] = 'phpwiki'; +$conf['authtype'] = 'phpcvs'; @include(DOKU_CONF.'local.protected.php');