From 0a2f96a93c591ba56f2b61f7f9d06fb17f275b46 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 11 Dec 2008 11:25:58 -0500
Subject: [PATCH] resolve conflicts in config.php.sample

darcs-hash:20081211162558-5ed1f-1eb8afbadbaa5f84140cbd255b1c01dc456577fd.gz
---
 config.php.sample | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/config.php.sample b/config.php.sample
index f3f33c5ca2..5f7a44c634 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';