diff --git a/Changes b/Changes
index dfaba176f..ab631cd35 100644
--- a/Changes
+++ b/Changes
@@ -1990,3 +1990,4 @@ seen. gmtime warning still there
This should fix (#0000767) reported by ora.
- Updated some documentation
- (Hopefully) fixed some Ziplinks problems
+- Added missing except tkl {} documentation
diff --git a/doc/unreal32docs.html b/doc/unreal32docs.html
index 6a47deed6..0796ab0f5 100644
--- a/doc/unreal32docs.html
+++ b/doc/unreal32docs.html
@@ -20,7 +20,7 @@
http://www.unrealircd.com
Version: 3.2
Current Version: 3.2 Beta15
- Last doc update: 2003-03-18
+ Last doc update: 2003-03-20
Head Coders: Stskeeps / codemastr / Luke / McSkaf / Syzop
Contributors: Zogg / NiQuiL / assyrian / chasm / DrBin / llthangel / Griever / nighthawk
Documentation: CKnight^ / Syzop
@@ -73,20 +73,21 @@
---4.17. Ban Realname Block -=- (n:Line)
---4.18. Ban Version Block
---4.19. Ban Exception Block -=- (E:Line)
- ---4.20. Scan Exception Block -=- (e:Line)
- ---4.21. Throttle Exception Block
- ---4.22. Deny DCC Block -=- (dccdeny.conf)
- ---4.23. Deny Version Block -=- (V:Line)
- ---4.24. Deny Link Block -=- (D:Line / d:Line)
- ---4.25. Deny Channel Block -=- (chrestrict.conf)
- ---4.26. Allow Channel Block
- ---4.27. Vhost Block Block -=- (vhost.conf)
- ---4.28. Badwords Block -=- (badwords.conf)
- ---4.29. Uline Block -=- (U:Line)
- ---4.30. Link Block -=- (C/N/H:Lines)
- ---4.31. Alias Block
- ---4.32. Help Block
- ---4.33. Set Block -=- (networks/unrealircd.conf)
+ ---4.20. TKL Exception Block
+ ---4.21. Scan Exception Block -=- (e:Line)
+ ---4.22. Throttle Exception Block
+ ---4.23. Deny DCC Block -=- (dccdeny.conf)
+ ---4.24. Deny Version Block -=- (V:Line)
+ ---4.25. Deny Link Block -=- (D:Line / d:Line)
+ ---4.26. Deny Channel Block -=- (chrestrict.conf)
+ ---4.27. Allow Channel Block
+ ---4.28. Vhost Block Block -=- (vhost.conf)
+ ---4.29. Badwords Block -=- (badwords.conf)
+ ---4.30. Uline Block -=- (U:Line)
+ ---4.31. Link Block -=- (C/N/H:Lines)
+ ---4.32. Alias Block
+ ---4.33. Help Block
+ ---4.34. Set Block -=- (networks/unrealircd.conf)
5. User & Channel Modes
6. User & Oper Commands
7. Frequently Asked Questions (FAQ)
@@ -1148,7 +1149,30 @@ except ban {
mask myident@my.isp.com;
};
4.20 - Scan Exceptions Block +
4.20 - TKL Exceptions Block + OPTIONAL +
+Syntax:
+
+except tkl {
+ mask <hostmask>;
+ type <type>;
+};
+The except tkl block allows you to specify a user@host that will override a + tkl ban placed on a broader host. This is useful when you want an ISP banned, but + still want specific users to be able to connect. The except::mask directive + specifies the user@host mask of the client who will be allowed to connect. The + except::type specifies which type of ban this should override. Valid types are + gline, gzline, and shun, which make an exception from Glines, Global Zlines, and + shuns.
+Example:
+
+except tkl {
+ mask myident@my.isp.com;
+ type gline;
+};
+
+4.21 - Scan Exceptions Block OPTIONAL (Previously known as the e:Line)
Syntax:
@@ -1166,7 +1190,7 @@ except scan {
mask 192.168.1.*;
};
4.21 - Throttle Exceptions Block +
4.22 - Throttle Exceptions Block OPTIONAL
Syntax:
@@ -1183,21 +1207,6 @@ except throtte {
mask 192.168.1.*;
};
4.22 - Throttle Exceptions Block - OPTIONAL -
-Syntax:
- except throttle {
- mask <ipmask>;
- };
The except throttle block allows you to specify an IP mask that will override the - throttling system. This only works if you have chosen to enable throttling. The - except::mask specifies an IP mask that will not be banned because of throttling.
-Example
- except throtte {
- mask 192.168.1.*;
- };
4.23 - Deny DCC Block OPTIONAL (Previously known as dccdeny.conf)
@@ -1246,7 +1255,7 @@ deny version { flag compiled into it, if it does not have a ! prefix, then it means the server must have this flag compiled. -4.23 - Deny Link Block +
4.25 - Deny Link Block OPTIONAL (Previously known as the D/d:Line)
Syntax:
@@ -1273,7 +1282,7 @@ deny link {
auto (only applies to autoconnects, /connect will still work), and all (applies
to all connection attempts).
4.25 - Deny Channel Block +
4.26 - Deny Channel Block OPTIONAL (Previously known as chrestrict.conf)
Syntax:
@@ -1294,7 +1303,7 @@ deny channel {
reason "No it don't!";
};
4.26 - Allow Channel Block +
4.27 - Allow Channel Block OPTIONAL
Syntax:
@@ -1311,7 +1320,7 @@ allow channel {
channel "#something";
};
4.27 - Vhost Block +
4.28 - Vhost Block OPTIONAL (Previously known as vhosts.conf)
Syntax:
@@ -1350,7 +1359,7 @@ vhost {
swhois "Im Special";
};
4.28 - Bad Word Block +
4.29 - Bad Word Block OPTIONAL (Previously known as badwords.*.conf)
Syntax:
@@ -1373,7 +1382,7 @@ badword channel {
replace shoot;
};
4.29 - ULines Block +
4.30 - ULines Block OPTIONAL (Previously known as the U:Line)
Syntax:
@@ -1394,7 +1403,7 @@ ulines {
stats.mynetwork.com;
};
4.30 - Link Block +
4.31 - Link Block OPTIONAL (Previously known as C/N/H:Lines)
Syntax:
@@ -1493,7 +1502,7 @@ link hub.mynet.com {
};
-
4.31 - Alias Block +
Syntax [standard alias]:
@@ -1540,7 +1549,7 @@ alias <name> {
from the second till the last. For examples of using the alias block in the
command format, consult doc/example.conf.
4.32 - Help Block +
Syntax:
@@ -1557,7 +1566,7 @@ help <name> {
for the help block are the text that will be displayed to the user when requesting
the /helpop.
4.33 - Set Block +
4.34 - Set Block REQUIRED (Previously known as unrealircd.conf/networks file)
The set file is what use to be our networks/unrealircd.conf and our networks