Automated merge with ssh://shadowircd/uranium/shadowircd/

[irc/rqf/shadowircd.git] / doc / example.conf

diff --git a/doc/example.conf b/doc/example.conf
index 08ae57b6139db5d603fb10a75092e2a17a4eaeac..33b9b032680f5fe30302ccf2d6d90c3114478a18 100755 (executable)
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -326,6 +326,9 @@ exempt {
 };
 
 channel {
+       autochanmodes = "nt";
+       use_halfop = yes;
+       use_owner = yes;
        use_invex = yes;
        use_except = yes;
        use_knock = yes;
@@ -345,6 +348,7 @@ channel {
        cycle_host_change = yes;
        host_in_topic = yes;
        resv_forcepart = yes;
+       kick_no_rejoin_time = 30 seconds;
 };
 
 serverhide {
@@ -510,7 +514,6 @@ general {
        reject_duration = 5 minutes;
        throttle_duration = 60;
        throttle_count = 4;
-       expire_override_time = 5 minutes;
 };
 
 modules {