summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2008-12-11 11:25:58 -0500
committerEvan Prodromou <evan@controlyourself.ca>2008-12-11 11:25:58 -0500
commit0a2f96a93c591ba56f2b61f7f9d06fb17f275b46 (patch)
tree02f76ab8eae48619adace8d87dff972ab1e7a85a
parent4b93bc99244fd7b7d56534d6877ec36e72409683 (diff)
resolve conflicts in config.php.sample
darcs-hash:20081211162558-5ed1f-1eb8afbadbaa5f84140cbd255b1c01dc456577fd.gz
-rw-r--r--config.php.sample16
1 files changed, 16 insertions, 0 deletions
diff --git a/config.php.sample b/config.php.sample
index f3f33c5ca..5f7a44c63 100644
--- 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';