Branch merge.

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

diff --git a/doc/reference.conf b/doc/reference.conf
index e0277583738f06069fa3fa30f98ba08a1fbdcdfa..e1a6e6fdd6e31fb9ab7afc6ae57fd11f0a407168 100755 (executable)
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -116,12 +116,12 @@ serverinfo {
         */
        #vhost6 = "3ffe:80e8:546::2";
 
-       /* max_clients: this should be set to the maximum amount of clients
-        * that the server should support. Note that you should leave some
-        * file descriptors free for log files, server connections, ident
-        * lookups (if enabled), exceed_limit clients, etc.
+       /* default max clients: the default maximum number of clients\r
+        * allowed to connect.  This can be changed once ircd has started by\r
+        * issuing:\r
+        *   /quote set maxclients <limit>\r
         */
-       max_clients = 1024;
+       default_max_clients = 1024;
 };
 
 /* admin {}: contains admin information about the server. (OLD A:) */
@@ -392,11 +392,13 @@ operator "god" {
         *               will not have the admin lines in
         *               stats p and whois.
         * xline:        allows use of /quote xline/unxline
+        * resv:         allows /quote resv/unresv and cmode +LP [DEFAULT]
         * operwall:     allows the oper to send/receive operwalls [DEFAULT]
         * oper_spy:     allows 'operspy' features to see through +s
         *               channels etc. see /quote help operspy
         * hidden_oper:  hides the oper from /stats p    (OLD UMODE +p) 
         * remoteban:    allows remote kline etc [DEFAULT]
+        * mass_notice:  allows sending wallops and mass notices [DEFAULT]
          */
        flags = global_kill, remote, kline, unkline, gline,
                die, rehash, admin, xline, operwall;
@@ -664,8 +666,8 @@ serverhide {
         */
        flatten_links = no;
 
-       /* links delay: how often to update the links file when it is
-        * flattened.
+       /* links delay: how long to wait before showing splits or new
+        * servers in a flattened /links output.
         */
        links_delay = 5 minutes;
 
@@ -763,11 +765,13 @@ alias "MS" {
  */
 general {
        /* hide error messages: defines whether error messages from
-        * servers are hidden or not.  These can sometimes contain IPs and
-        * can have an adverse effect on server ip hiding.  Set to:
+        * servers that are not deemed fully safe are hidden or not.
+        * These can sometimes contain IPs and can have an adverse
+        * effect on server ip hiding.  Set to:
         *   yes:   hide from opers and admin
         *   opers: hide from opers only
         *   no:    do not hide error messages
+        * Admins on other servers count as opers.
         */
        hide_error_messages = opers;
 
@@ -832,12 +836,6 @@ general {
         */
        dots_in_ident=2;
 
-       /* dot in ipv6: ircd-hybrid-6.0 and earlier will disallow hosts 
-        * without a '.' in them.  this will add one to the end.  only needed
-        * for older servers.
-        */
-        dot_in_ip6_addr = no;
-        
         /* min nonwildcard: the minimum non wildcard characters in k/d/g lines
         * placed via the server.  klines hand placed are exempt from limits.
         * wildcard chars: '.' '*' '?' '@'
@@ -1028,11 +1026,6 @@ general {
         */
        gline_min_cidr = 16;
 
-       /* idletime: the maximum amount of time a user may idle before
-        * they are disconnected
-        */
-        idletime = 0;
-
        /* REMOVE ME.  The following line checks you've been reading. */
        havent_read_conf = yes;