Merge pull request #454 from SaberUK/master+misc-improvements

Purge dead code and deprecated types.

4 files changed, 8 insertions, 43 deletions

diff --git a/docs/conf/helpop-full.conf.example b/docs/conf/helpop-full.conf.example
index bc9326e62..ffd3761be 100644
--- a/docs/conf/helpop-full.conf.example
+++ b/docs/conf/helpop-full.conf.example
@@ -804,15 +804,15 @@ Closes all unregistered connections to the local server.">
 
  v [nickname]       Gives voice to [nickname], allowing them to speak
                     while the channel is +m.
- h [nickname]       Gives halfop status to [nickname] (this mode can
-                    be disabled).
+ h [nickname]       Gives halfop status to [nickname] (requires
+                    customprefix module).
  o [nickname]       Gives op status to [nickname].
  a [nickname]       Gives protected status to [nickname], preventing
                     them from them from being kicked (+q only,
-                    requires chanprotect module).
+                    requires customprefix module).
  q [nickname]       Gives owner status to [nickname], preventing them
                     from being kicked (Services or only, requires
-                    chanprotect module).
+                    customprefix module).
 
  b [hostmask]       Bans [hostmask] from the channel.
  e [hostmask]       Excepts [hostmask] from bans (requires
diff --git a/docs/conf/helpop.conf.example b/docs/conf/helpop.conf.example
index 02ddff8a2..d54752cfb 100644
--- a/docs/conf/helpop.conf.example
+++ b/docs/conf/helpop.conf.example
@@ -117,15 +117,15 @@ LOCKSERV       UNLOCKSERV   JUMPSERVER">
 
  v [nickname]       Gives voice to [nickname], allowing them to speak
                     while the channel is +m.
- h [nickname]       Gives halfop status to [nickname] (this mode can
-                    be disabled).
+ h [nickname]       Gives halfop status to [nickname] (requires
+                    customprefix module).
  o [nickname]       Gives op status to [nickname].
  a [nickname]       Gives protected status to [nickname], preventing
                     them from them from being kicked (+q only,
-                    requires chanprotect module).
+                    requires customprefix module).
  q [nickname]       Gives owner status to [nickname], preventing them
                     from being kicked (Services or only, requires
-                    chanprotect module).
+                    customprefix module).
 
  b [hostmask]       Bans [hostmask] from the channel.
  e [hostmask]       Excepts [hostmask] from bans (requires
diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
index a163c1646..bd64f69f5 100644
--- a/docs/conf/modules.conf.example
+++ b/docs/conf/modules.conf.example
@@ -418,32 +418,6 @@
 #<module name="m_channelban.so">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
-# Chanprotect module: gives +q and +a channel modes
-#<module name="m_chanprotect.so">
-
-<chanprotect
-	# noservices: With this set to yes, when a user joins a empty channel,
-	# the server will set +q on them. If set to no, it will only set +o
-	# on them until they register the channel.
-	noservices="no"
-
-	# qprefix: Prefix (symbol) to use for +q users.
-	qprefix="~"
-
-	# aprefix: Prefix (symbol) to use for +a users.
-	aprefix="&amp;"
-
-	# deprotectself: If this value is set (true, yes or 1), it will allow
-	# +a and +q users to remove the +a and +q from themselves, otherwise,
-	# the status will have to be removed by services.
-	deprotectself="yes"
-
-	# deprotectothers: If this value is set to yes, true, or 1, then any
-	# user with +q or +a may remove the +q or +a from other users.
-	deprotectothers="yes">
-
-
-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # Check module: gives /check
 # Check is useful for looking up information on channels,
 # users, IP addresses and hosts.
diff --git a/docs/conf/modules/unrealircd.conf.example b/docs/conf/modules/unrealircd.conf.example
index fa5d652f1..2d27b43a0 100644
--- a/docs/conf/modules/unrealircd.conf.example
+++ b/docs/conf/modules/unrealircd.conf.example
@@ -93,15 +93,6 @@
 <module name="m_chanfilter.so">
 <chanfilter hidemask="yes">
 
-<module name="m_chanprotect.so">
-
-<chanprotect
-	noservices="no"
-	qprefix="~"
-	aprefix="&amp;"
-	deprotectself="yes"
-	deprotectothers="yes">
-
 <module name="m_check.so">
 <module name="m_chghost.so">
 <hostname charmap="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.-_/0123456789">