Branch merge
This commit is contained in:
commit
bf176248cf
2 changed files with 7 additions and 3 deletions
|
@ -22,6 +22,12 @@
|
||||||
Anything from a # to the end of a line is a comment. Blank lines are ignored. C-style comments are also supported.
|
Anything from a # to the end of a line is a comment. Blank lines are ignored. C-style comments are also supported.
|
||||||
</para>
|
</para>
|
||||||
</sect1>
|
</sect1>
|
||||||
|
<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.
|
||||||
|
</para>
|
||||||
<sect2>
|
<sect2>
|
||||||
<title>loadmodule directive</title>
|
<title>loadmodule directive</title>
|
||||||
<synopsis>
|
<synopsis>
|
||||||
|
@ -353,7 +359,7 @@ auth {
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term>kline_exempt (^)</term>
|
<term>kline_exempt (^)</term>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>Users in this auth{} block are exempted from DNS blacklists, k:lines, g:lines and x:lines.</para>
|
<para>Users in this auth{} block are exempted from DNS blacklists, k:lines and x:lines.</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
|
|
|
@ -16,8 +16,6 @@ X B - Shows hash statistics
|
||||||
* e - Shows exemptions to D lines
|
* e - Shows exemptions to D lines
|
||||||
X E - Shows Events
|
X E - Shows Events
|
||||||
X f - Shows File Descriptors
|
X f - Shows File Descriptors
|
||||||
* g - Shows pending G lines
|
|
||||||
* G - Shows active G lines
|
|
||||||
^ h - Shows hub_mask/leaf_mask (Old H:/L: lines)
|
^ h - Shows hub_mask/leaf_mask (Old H:/L: lines)
|
||||||
^ i - Shows auth blocks (Old I: lines)
|
^ i - Shows auth blocks (Old I: lines)
|
||||||
^ K - Shows K lines (or matched klines)
|
^ K - Shows K lines (or matched klines)
|
||||||
|
|
Loading…
Reference in a new issue