diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2010-08-29 14:22:01 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2010-08-29 14:22:01 +0200 |
| commit | 2c053ed58376c6709596ab48fc40dceb90d4e89d (patch) | |
| tree | c8d0f78c2f47f373473419396d3c0855ec671eca /conf/local.php.dist | |
| parent | cb4a07568e84d853fbcd9d5eca37f572fa10786f (diff) | |
| parent | 5479a8c3341247ca228026819f20f3ab5c34a80f (diff) | |
| download | rpg-2c053ed58376c6709596ab48fc40dceb90d4e89d.tar.gz rpg-2c053ed58376c6709596ab48fc40dceb90d4e89d.tar.bz2 | |
Merge branch 'master' into stable
Conflicts:
conf/msg
lib/plugins/acl/ajax.php
Diffstat (limited to 'conf/local.php.dist')
| -rw-r--r-- | conf/local.php.dist | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/conf/local.php.dist b/conf/local.php.dist index 4af6ea594..0397954f4 100644 --- a/conf/local.php.dist +++ b/conf/local.php.dist @@ -1,6 +1,6 @@ <?php /** - * This is an example of how a local.php coul look like. + * This is an example of how a local.php could look like. * Simply copy the options you want to change from dokuwiki.php * to this file and change them. * @@ -14,13 +14,3 @@ //$conf['useacl'] = 1; //Use Access Control Lists to restrict access? //$conf['superuser'] = 'joe'; -/** - * The following options are usefull, if you use a MySQL - * database as autentication backend. Have a look into - * mysql.conf.php too and adjust the options to match - * your database installation. - */ -//$conf['authtype'] = 'mysql'; -//require_once ("mysql.conf.php"); - - |