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

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

diff --git a/doc/reference.conf b/doc/reference.conf
index 96057d7861bf4e4010eff82cbd21d5b9141c26ba..e019e39d0586cc6a80cf2752836bde256ef0c274 100755 (executable)
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -673,6 +673,25 @@ exempt {
 
 /* The channel block contains options pertaining to channels */
 channel {
+       /* autochanmodes: Modes that will be set on a unregistered channel
+        * when the first user joins it.
+        */
+       autochanmodes = "nt";
+
+       /* halfop: Enable/disable channel mode +h, which adds halfop,
+        * a channel status below op that has op powers (kick, ban, mode, etc.)
+        * halfops can only kick/devoice/etc people who are +v or
+        * do not have any channel status.
+        */
+       use_halfop = yes;
+
+       /* owner: Enable/disable channel mode +a, which adds owner,
+        * a channel status above op that has op powers (kick, ban, mode, etc.)
+        * owners can only be kicked/deownered by other owners, and may kick
+        * or deop ops and halfops.
+        */
+       use_owner = yes;
+
        /* invex: Enable/disable channel mode +I, a n!u@h list of masks
         * that can join a +i channel without an invite.
         */
@@ -779,6 +798,11 @@ channel {
         * when a RESV is issued.
         */
        resv_forcepart = yes;
+
+       /* kick_no_rejoin_time: the amount of time that a user cannot
+        * rejoin for after being kicked out of a +J channel.
+        */
+       kick_no_rejoin_time = 30 seconds;
 };
 
 
@@ -1260,12 +1284,6 @@ general {
        /* throttle_count: Number of connections within throttle_duration that it takes
         * for throttling to take effect */
        throttle_count = 4;
-
-       /* expire_override_time: User mode +p (override) will be automatically unset
-        * this long after it is set. 0 disables this (not recommended). Default is
-        * 5 minutes.
-        */
-       expire_override_time = 5 minutes;
 };
 
 modules {