From e7d250a693e80863ec401e575fe0b4ac6db8bbee Mon Sep 17 00:00:00 2001 From: jilles Date: Wed, 28 Mar 2007 08:30:56 -0700 Subject: [PATCH] [svn] Merge old trunk r2059 Clarifications to the descriptions of umode +Q and cmode +F, suggested by Ariadne@SorceryNet. --- ChangeLog | 12 ++++++++++++ doc/sgml/oper-guide/cmodes.sgml | 6 ++++++ doc/sgml/oper-guide/umodes.sgml | 7 ++++--- include/serno.h | 2 +- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 860de32..7ccd615 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +jilles 2007/03/28 15:22:49 UTC (20070328-3303) + Log: + Merge old trunk r2907,r2991: + Allow TESTLINE on channel names. + + + Changes: Modified: + +4 -0 trunk/doc/sgml/oper-guide/commands.sgml (File Modified) + +4 -0 trunk/help/opers/testline (File Modified) + +22 -0 trunk/modules/m_testline.c (File Modified) + + jilles 2007/03/28 15:04:06 UTC (20070328-3301) Log: Merge old trunk r2835: diff --git a/doc/sgml/oper-guide/cmodes.sgml b/doc/sgml/oper-guide/cmodes.sgml index c56a1be..bd59116 100644 --- a/doc/sgml/oper-guide/cmodes.sgml +++ b/doc/sgml/oper-guide/cmodes.sgml @@ -57,6 +57,12 @@ This mode takes one parameter of the same form as bans, which overrides +b and +q bans for all clients it matches. + + This can be useful if it is necessary to ban an entire ISP + due to persistent abuse, but some users from that ISP should + still be allowed in. For example: + /mode #channel +be *!*@*.example.com *!*someuser@host3.example.com + Only channel operators can see +e changes or request the list. diff --git a/doc/sgml/oper-guide/umodes.sgml b/doc/sgml/oper-guide/umodes.sgml index bcf858c..cb6b81b 100644 --- a/doc/sgml/oper-guide/umodes.sgml +++ b/doc/sgml/oper-guide/umodes.sgml @@ -105,9 +105,10 @@ This is a user umode, which anybody can set. It is not specific to operators. - This umode prevents you from being affected by any of the channel forwarding mechanisms. In - any event where you would normally be forwarded, instead you will get the usual error message - as if no forwarding was in effect. + This umode prevents you from being affected by channel forwarding. + If enabled on a channel, channel forwarding sends you to another + channel if you could not join. See channel mode +f for more + information. diff --git a/include/serno.h b/include/serno.h index 415152b..a583c89 100644 --- a/include/serno.h +++ b/include/serno.h @@ -1 +1 @@ -#define SERNO "20070328-3301" +#define SERNO "20070328-3303"