resolve conflicts in config.php.sample

darcs-hash:20081211162558-5ed1f-1eb8afbadbaa5f84140cbd255b1c01dc456577fd.gz

diff --git a/config.php.sample b/config.php.sample
index f3f33c5ca2ff1b70721842458ad0a6a995178842..5f7a44c6344ea96277c03e881cd95a75ab4c3255 100644 (file)
--- a/config.php.sample
+++ b/config.php.sample
@@ -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';