resolve conflicts in config.php.sample

darcs-hash:20081211162558-5ed1f-1eb8afbadbaa5f84140cbd255b1c01dc456577fd.gz
This commit is contained in:
Evan Prodromou 2008-12-11 11:25:58 -05:00
parent 4b93bc9924
commit 0a2f96a93c

View File

@ -122,3 +122,19 @@ $config['sphinx']['port'] = 3312;
#Twitter integration source attribute. Note: default is Laconica
#$config['integration']['source'] = 'Laconica';
# Edit throttling. Off by default. If turned on, you can only post 20 notices
# every 10 minutes. Admins may want to play with the settings to minimize inconvenience for
# real users without getting uncontrollable floods from spammers or runaway bots.
#$config['throttle']['enabled'] = true;
#$config['throttle']['count'] = 100;
#$config['throttle']['timespan'] = 3600;
# List of users banned from posting (nicknames and/or IDs)
#$config['profile']['banned'][] = 'hacker';
#$config['profile']['banned'][] = 12345;
# config section for the built-in Facebook application
#$config['facebook']['apikey'] = 'APIKEY';
#$config['facebook']['secret'] = 'SECRET';