summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorSadie Powell <sadie@witchery.services>2021-02-18 23:59:28 +0000
committerSadie Powell <sadie@witchery.services>2021-02-18 23:59:28 +0000
commitc68b81eac87314fb0da83a83fed8679e521cf8eb (patch)
tree1200203b739e52f652a9ba1170e4813270780edb /data
parent8b2c1548ab46401f96d4e2e0f8258664e21744fb (diff)
parent4d271e021042f0b2708abaff5ff3cfb1504a5cc0 (diff)
Merge branch '2.0' into 2.1.
Diffstat (limited to 'data')
-rw-r--r--data/nickserv.example.conf8
1 files changed, 5 insertions, 3 deletions
diff --git a/data/nickserv.example.conf b/data/nickserv.example.conf
index 853e87917..bb9b8fec8 100644
--- a/data/nickserv.example.conf
+++ b/data/nickserv.example.conf
@@ -92,8 +92,10 @@ module
*
* The options are:
* - killprotect: Kill nick if not identified within 60 seconds
- * - kill_quick: Kill nick if not identified within 20 seconds, this one overrides the above
- * option and the above must be specified with this one
+ * - kill_quick: Kill nick if not identified within 20 seconds, this one overrides the killprotect
+ * option and the killprotect option must be specified with this one
+ * - kill_immed: Kill nick immediately if not identified, this one overrides both the killprotect
+ * and kill_quick options and the killprotect option must be specified with this one
* - ns_secure: Enable nickname security, requiring the nick's password before any operations
* can be done on it
* - ns_private: Hide the nick from NickServ's LIST command
@@ -113,7 +115,7 @@ module
* This directive is optional, if left blank, the options will default to ns_secure, memo_signon, and
* memo_receive. If you really want no defaults, use "none" by itself as the option.
*/
- defaults = "ns_secure ns_private hide_email hide_mask memo_signon memo_receive autoop"
+ defaults = "killprotect ns_secure ns_private hide_email hide_mask memo_signon memo_receive autoop"
/*
* The minimum length of time between consecutive uses of NickServ's REGISTER command. This