Change SWHOIS to OPTCOMMON, remove m_operinvex

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11789 e03df62e-2008-0410-955e-edbf42e46eb7

3 files changed, 5 insertions, 11 deletions

diff --git a/conf/inspircd.helpop-full.example b/conf/inspircd.helpop-full.example
index 1942a2935..48e5186d8 100644
--- a/conf/inspircd.helpop-full.example
+++ b/conf/inspircd.helpop-full.example
@@ -995,7 +995,7 @@ Note that all /STATS use is broadcast to online IRC operators.">
               nonicks module).
  O:opertype   Prevents IRCops of the specified opertype from joining
               the channel, mostly useful as an invite exception (IRCop
-              only, requires operinvex module).
+              only, requires operchans module).
  Q:n!u@h      Blocks kicks by matching users (requires nokicks
               module).
  R:account    Prevents users logged into a matching account from
diff --git a/conf/inspircd.helpop.example b/conf/inspircd.helpop.example
index 2e69a546b..8a53629e9 100644
--- a/conf/inspircd.helpop.example
+++ b/conf/inspircd.helpop.example
@@ -271,7 +271,7 @@ help channel if you have any questions.">
               nonicks module).
  O:opertype   Prevents IRCops of the specified opertype from joining
               the channel, mostly useful as an invite exception (IRCop
-              only, requires operinvex module).
+              only, requires operchans module).
  Q:n!u@h      Blocks kicks by matching users (requires nokicks
               module).
  R:account    Prevents users logged into a matching account from
diff --git a/conf/modules.conf.example b/conf/modules.conf.example
index d3e77ca26..4fb3ef80d 100644
--- a/conf/modules.conf.example
+++ b/conf/modules.conf.example
@@ -1103,19 +1103,13 @@
 
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
-# Oper channels mode: Adds the +O channel mode
-# This module is oper-only.
-#<module name="m_operchans.so">
-
-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
-# Oper invex/extban module: Adds +beI type O, to ban, exempt, and invex
-# given oper type masks.
+# Oper channels mode: Adds the +O channel mode and +beI type O:<mask>
+# to ban, exempt, and invex given oper type masks.
 # e.g, /mode #channel +iI O:* is equivilant to chmode +O, but you
 # may also, e.g. /mode #channel +iI O:AdminTypeOnly to only allow admins.
 # +be work in a similar fashion.
-# This module is oper-only.
 #
-#<module name="m_operinvex.so">
+#<module name="m_operchans.so">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # Oper Join module: Auto-joins opers to a channel upon oper-up