Automated merge with ssh://hg.atheme.org//hg/charybdis

[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 ab928621262eabf67d9dd1c6af3e09ee2d1f168f..a5ae1df08dbb0a991c012ad7324a5bf822facea2 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, and will not be disconnected because of d: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>
@@ -659,6 +653,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 +1018,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 +1036,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>