From f0e3fa7629b26d7dfa6af3764f03384b34b09da5 Mon Sep 17 00:00:00 2001
From: jilles <devnull@localhost>
Date: Thu, 23 Aug 2007 14:02:31 -0700
Subject: [PATCH] [svn] Add more information about invitations and invexes.

---
 ChangeLog                       | 9 +++++++++
 doc/sgml/oper-guide/cmodes.sgml | 8 +++++++-
 include/serno.h                 | 2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e2e6b914e..115373aab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+jilles      2007/08/23 19:00:10 UTC	(20070823-3558)
+  Log:
+  Add what /invite actually does (bypass +ijlr).
+  
+
+  Changes:	Modified:
+  +2 -0		trunk/help/opers/invite (File Modified) 
+
+
 jilles      2007/08/18 14:45:10 UTC	(20070818-3556)
   Log:
   callerid (+g) documentation:
diff --git a/doc/sgml/oper-guide/cmodes.sgml b/doc/sgml/oper-guide/cmodes.sgml
index bd5911654..09e323d9b 100644
--- a/doc/sgml/oper-guide/cmodes.sgml
+++ b/doc/sgml/oper-guide/cmodes.sgml
@@ -104,7 +104,7 @@
 	  is unset, only channel operators may use the INVITE command.
 	</para>
 	<para>
-	  When this mode is set together with +i, all channel members can influence who can join.
+	  When this mode is set together with +i, +j, +l or +r, all channel members can influence who can join.
 	</para>
       </sect2>
       <sect2>
@@ -119,6 +119,7 @@
 	<para>
 	  This mode takes one parameter of the same form as bans. Matching
 	  clients do not need to be invited to join the channel when it is invite-only (+i).
+	  Unlike the INVITE command, this does not override +j, +l and +r.
 	</para>
 	<para>
 	  Only channel operators can see +I changes or request the list.
@@ -129,6 +130,9 @@
         <para>
           This mode takes one parameter of the form <replaceable>n</replaceable>:<replaceable>t</replaceable>, where <replaceable>n</replaceable> and <replaceable>t</replaceable> are positive integers. Only <replaceable>n</replaceable> users may join in each period of <replaceable>t</replaceable> seconds.
         </para>
+	<para>
+	  Invited users can join regardless of +j, but are counted as normal.
+	</para>
 	<para>
 	  Due to propagation delays between servers, more users may be
 	  able to join (by racing for the last slot on each server).
@@ -146,6 +150,7 @@
 	<para>
 	  Takes one numeric parameter, the number of users which are allowed to be in the channel before
 	  further joins are blocked.
+	  Invited users may join regardless.
 	</para>
 	<para>
 	  Due to propagation delays between servers, more users may be
@@ -243,6 +248,7 @@
         <title>+r, block unidentified</title>
         <para>
           When set, this mode prevents unidentified users from joining.
+	  Invited users can still join.
         </para>
       </sect2>
       <!-- not planned (jilles)
diff --git a/include/serno.h b/include/serno.h
index 6bc86139b..12943d17f 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070818-3556"
+#define SERNO "20070823-3558"