[svn] Merge old trunk r2059

Clarifications to the descriptions of umode +Q and cmode +F,
suggested by Ariadne@SorceryNet.

diff --git a/ChangeLog b/ChangeLog
index 860de326fee0ae2048b35496920f086622f67bef..7ccd61566bab6301cd9840b8ed13cdc5e78c05d3 100644 (file)
--- 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 c56a1be1982dd47531aa67ff8cac59540f65afe6..bd5911654597c659509c9898e4a59d2d1a5bbee2 100644 (file)
--- 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.
        </para>
+       <para>
+         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
+       </para>
        <para>
          Only channel operators can see +e changes or request the list.
        </para>

diff --git a/doc/sgml/oper-guide/umodes.sgml b/doc/sgml/oper-guide/umodes.sgml
index bcf858c125bf80796cbdf46987af1a010ca03bd2..cb6b81b15491102e1918e9b53639e6a86698fb3a 100644 (file)
--- 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.
            </para>
          </note>
-          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.
        </para>
       </sect2>
       <sect2>

diff --git a/include/serno.h b/include/serno.h
index 415152b6b48bf53fe5738904762d6c44d8f781a7..a583c898d178d22d83b45678b08f3a75b45ea13b 100644 (file)
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070328-3301"
+#define SERNO "20070328-3303"