Remove comment referencing LazyLeaf.

[irc/rqf/shadowircd.git] / doc / sgml / oper-guide / config.sgml

diff --git a/doc/sgml/oper-guide/config.sgml b/doc/sgml/oper-guide/config.sgml
index f2ce387406f1b618f4e95f3cf19d5ed2cec650fd..fc44fb73e730435b9a21b85f605dd8d7f465937f 100644 (file)
--- a/doc/sgml/oper-guide/config.sgml
+++ b/doc/sgml/oper-guide/config.sgml
@@ -25,8 +25,8 @@
     <sect1 id="configlines">
       <title>Specific blocks and directives</title>
       <para>
-       Not all configuration blocks and directives are listed here, only the most common ones. More blocks and directives will
-       be documented in later revisions of this manual.
+       Not all configuration blocks and directives are listed here, only the most common ones. More blocks and directives will
+       be documented in later revisions of this manual.
       </para>
       <sect2>
        <title>loadmodule directive</title>
@@ -359,13 +359,7 @@ auth {
          <varlistentry>
            <term>kline_exempt (^)</term>
            <listitem>
-             <para>Users in this auth{} block are exempted from DNS blacklists, k:lines, g:lines and x:lines.</para>
-           </listitem>
-         </varlistentry>
-         <varlistentry>
-           <term>gline_exempt (_)</term>
-           <listitem>
-             <para>Users in this auth{} block are exempted from g:lines.</para>
+             <para>Users in this auth{} block are exempted from DNS blacklists, k:lines and x:lines.</para>
            </listitem>
          </varlistentry>
          <varlistentry>
@@ -555,8 +549,6 @@ connect "<replaceable>name</replaceable>" {
            <listitem>
              <para>The hostname or IP to connect to.</para>
              <note><para>
-               Charybdis uses solely DNS for all hostname/address lookups
-               (no <filename>/etc/hosts</filename> or anything else).
                Furthermore, if a hostname is used, it must have an A or AAAA
                record (no CNAME) and it must be the primary
                hostname for inbound connections to work.
@@ -659,6 +651,7 @@ connect "<replaceable>name</replaceable>" {
            <term>topicburst</term>
            <listitem>
              <para>Topics should be bursted to this server.</para>
+             <para>This is enabled by default.</para>
            </listitem>
          </varlistentry>
        </variablelist>
@@ -1023,7 +1016,7 @@ shared {
          <varlistentry>
            <term>all</term>
            <listitem>
-             <para>All of the above; this does not include locops or rehash</para>
+             <para>All of the above; this does not include locops, rehash, dline, tdline or undline.</para>
            </listitem>
          </varlistentry>
          <varlistentry>
@@ -1041,6 +1034,24 @@ shared {
              <para>REHASH commands; all options can be used</para>
            </listitem>
          </varlistentry>
+         <varlistentry>
+           <term>dline (D)</term>
+           <listitem>
+             <para>Permanent and temporary D:lines</para>
+           </listitem>
+         </varlistentry>
+         <varlistentry>
+           <term>tdline (d)</term>
+           <listitem>
+             <para>Temporary D:lines</para>
+           </listitem>
+         </varlistentry>
+         <varlistentry>
+           <term>undline (E)</term>
+           <listitem>
+             <para>D:line removals</para>
+           </listitem>
+         </varlistentry>
          <varlistentry>
            <term>none</term>
            <listitem>
@@ -1081,6 +1092,28 @@ service {
        </variablelist>
       </sect2>
     </sect1>
+    <sect1>
+      <title>Hostname resolution (DNS)</title>
+      <para>
+       Charybdis uses solely DNS for all hostname/address lookups
+       (no <filename>/etc/hosts</filename> or anything else).
+       The DNS servers are taken from <filename>/etc/resolv.conf</filename>.
+       If this file does not exist or no valid IP addresses are listed in it,
+       the local host (127.0.0.1) is used. (Note that the latter part
+       did not work in older versions of Charybdis.)
+      </para>
+      <para>
+       IPv4 as well as IPv6 DNS servers are supported, but it is not
+       possible to use both IPv4 and IPv6 in
+       <filename>/etc/resolv.conf</filename>.
+      </para>
+      <para>
+       For both security and performance reasons, it is recommended
+       that a caching nameserver such as BIND be run on the same machine
+       as Charybdis and that <filename>/etc/resolv.conf</filename> only
+       list 127.0.0.1.
+      </para>
+    </sect1>
   </chapter>
 <!-- Keep this comment at the end of the file
 Local variables: