Some configuration file updates: Removed now non-existing settings. Redid some existing settings to look more consistent/uniform. Added some missing commands/permissions.

Merged operserv/modlist permission into operserv/modinfo.
Fixed ChanServ INFO privilege to actually work for /BotServ INFO too for those users who have it, instead of only for founders.
Fixed some typos aswell as removed whitespaces along the way.

1 files changed, 95 insertions, 93 deletions

diff --git a/data/chanserv.example.conf b/data/chanserv.example.conf
index 3971e8cd2..e885fd8fe 100644
--- a/data/chanserv.example.conf
+++ b/data/chanserv.example.conf
@@ -35,8 +35,8 @@ service
 	 * These modes are very IRCd specific. If left commented, sane defaults
 	 * are used based on what protocol module you have loaded.
 	 *
-	 * Note that setting this option incorrectly could potentially BREAK some if
-	 * not all usefulness of the client. We will not support you if this client is
+	 * Note that setting this option incorrectly could potentially BREAK some, if
+	 * not all, usefulness of the client. We will not support you if this client is
 	 * unable to do certain things if this option is enabled.
 	 */
 	#modes = "+o"
@@ -46,7 +46,7 @@ service
 	 * of log channels this is not very useful, as the service will just idle in the
 	 * specified channels, and will not accept any types of commands.
 	 *
-	 * Prefixes may be given to the channels in the form of mode character or prefix symbol.
+	 * Prefixes may be given to the channels in the form of mode characters or prefix symbols.
 	 */
 	#channels = "@#services,#mychan"
 }
@@ -117,7 +117,7 @@ chanserv
 	 * The length of time before a suspended channel becomes unsuspended.
 	 *
 	 * This directive is optional.
-	 * If not set, the default is to never.
+	 * If not set, the default is never.
 	 */
 	#suspendexpire = 90d
 
@@ -125,7 +125,7 @@ chanserv
 	 * The lenth of time before a forbidden channel drops.
 	 *
 	 * This directive is optional.
-	 * If not set, the default is to never.
+	 * If not set, the default is never.
 	 */
 	#forbidexpire = 90d
 
@@ -429,7 +429,7 @@ privilege
 /*
  * FOUNDER privilege.
  *
- * Used by botserv/info, chanserv/access, chanserv/akick,
+ * Used by chanserv/access, chanserv/akick,
  * chanserv/drop, chanserv/set/founder,
  * chanserv/set/securefounder, chanserv/set/successor and chanserv/xop.
  *
@@ -869,7 +869,7 @@ command_group
 
 command_group
 {
-	name = "chanserv/admin";
+	name = "chanserv/admin"
 	description = "Services Operator commands"
 }
 
@@ -885,8 +885,8 @@ command { service = "ChanServ"; name = "HELP"; command = "generic/help"; }
  * Used for giving users access in channels.
  */
 module { name = "cs_access" }
-command { service = "ChanServ"; name = "ACCESS"; command = "chanserv/access"; group = "chanserv/access" }
-command { service = "ChanServ"; name = "LEVELS"; command = "chanserv/levels"; group = "chanserv/access" }
+command { service = "ChanServ"; name = "ACCESS"; command = "chanserv/access"; group = "chanserv/access"; }
+command { service = "ChanServ"; name = "LEVELS"; command = "chanserv/levels"; group = "chanserv/access"; }
 
 /*
  * cs_akick
@@ -896,7 +896,7 @@ command { service = "ChanServ"; name = "LEVELS"; command = "chanserv/levels"; gr
  * Used for preventing users from joining channels.
  */
 module { name = "cs_akick" }
-command { service = "ChanServ"; name = "AKICK"; command = "chanserv/akick"; group = "chanserv/management" }
+command { service = "ChanServ"; name = "AKICK"; command = "chanserv/akick"; group = "chanserv/management"; }
 
 /*
  * cs_ban
@@ -916,7 +916,7 @@ command { service = "ChanServ"; name = "BAN"; command = "chanserv/ban"; }
  * Used for copying channel settings from one channel to another.
  */
 module { name = "cs_clone" }
-command { service = "ChanServ"; name = "CLONE"; command = "chanserv/clone"; group = "chanserv/management" }
+command { service = "ChanServ"; name = "CLONE"; command = "chanserv/clone"; group = "chanserv/management"; }
 
 /*
  * cs_drop
@@ -936,7 +936,7 @@ command { service = "ChanServ"; name = "DROP"; command = "chanserv/drop"; }
  * Used to enforce various channel settings such as secureops and restricted.
  */
 module { name = "cs_enforce" }
-command { service = "ChanServ"; name = "ENFORCE"; command = "chanserv/enforce"; group = "chanserv/management" }
+command { service = "ChanServ"; name = "ENFORCE"; command = "chanserv/enforce"; group = "chanserv/management"; }
 
 /*
  * cs_entrymsg
@@ -946,7 +946,7 @@ command { service = "ChanServ"; name = "ENFORCE"; command = "chanserv/enforce";
  * Used to configure entry messages sent to users when they join a channel.
  */
 module { name = "cs_entrymsg" }
-command { service = "ChanServ"; name = "ENTRYMSG"; command = "chanserv/entrymsg"; group = "chanserv/management" }
+command { service = "ChanServ"; name = "ENTRYMSG"; command = "chanserv/entrymsg"; group = "chanserv/management"; }
 cs_entrymsg
 {
 	/* The maximum number of entrymsgs allowed per channel. If not set, defaults to 5. */
@@ -962,7 +962,7 @@ cs_entrymsg
  * Used for giving users access in channels.
  */
 module { name = "cs_flags" }
-command { service = "ChanServ"; name = "FLAGS"; command = "chanserv/flags"; group = "chanserv/access" }
+command { service = "ChanServ"; name = "FLAGS"; command = "chanserv/flags"; group = "chanserv/access"; }
 
 /*
  * cs_getkey
@@ -1012,7 +1012,7 @@ command { service = "ChanServ"; name = "KICK"; command = "chanserv/kick"; }
  * Used for retrieving and searching the registered channel list.
  */
 module { name = "cs_list" }
-command { service = "ChanServ"; name = "LIST"; command = "chanserv/list"; permission = "chanserv/list"; group = "chanserv/admin" }
+command { service = "ChanServ"; name = "LIST"; command = "chanserv/list"; permission = "chanserv/list"; group = "chanserv/admin"; }
 
 /*
  * cs_log
@@ -1022,7 +1022,7 @@ command { service = "ChanServ"; name = "LIST"; command = "chanserv/list"; permis
  * Use for configuring what actions on channels are logged and where.
  */
 module { name = "cs_log" }
-command { service = "ChanServ"; name = "LOG"; command = "chanserv/log"; group = "chanserv/management" }
+command { service = "ChanServ"; name = "LOG"; command = "chanserv/log"; group = "chanserv/management"; }
 
 /*
  * cs_mode
@@ -1032,7 +1032,7 @@ command { service = "ChanServ"; name = "LOG"; command = "chanserv/log"; group =
  * Used for changing mode locks and changing modes.
  */
 module { name = "cs_mode" }
-command { service = "ChanServ"; name = "MODE"; command = "chanserv/mode"; group = "chanserv/management" }
+command { service = "ChanServ"; name = "MODE"; command = "chanserv/mode"; group = "chanserv/management"; }
 
 /*
  * cs_register
@@ -1053,13 +1053,13 @@ command { service = "ChanServ"; name = "REGISTER"; command = "chanserv/register"
  * Also allows administrators to view stats about seen data and purge the database.
  */
 module { name = "cs_seen" }
-command { service = "OperServ"; name = "SEEN"; command = "operserv/seen"; }
+command { service = "OperServ"; name = "SEEN"; command = "operserv/seen"; permission = "operserv/seen"; }
 cs_seen
 {
 	/* Sets the time to keep seen entries in the seen database. */
 	purgetime = "30d"
 
-	/* Sets the delay between checks for expired seen entries */
+	/* Sets the delay between checks for expired seen entries. */
 	expiretimeout = "1d"
 }
 
@@ -1069,9 +1069,9 @@ cs_seen
  * Provides the commands:
  *   chanserv/set and chanserv/saset - Dummy help wrappers for the SET and SASET commands.
  *   chanserv/set/autoop - Used for configuring whether or not ChanServ automatically gives channel status to users.
- *   chanserv/set/bantype - Used for controlling what format bans are placed on channels.
+ *   chanserv/set/bantype - Used for controlling what format of bans are placed on channels.
  *   chanserv/set/description - Used for changing channels descriptions.
- *   chanserv/set/founder - Used for changing a channels founder.
+ *   chanserv/set/founder - Used for changing a channel's founder.
  *   chanserv/set/keeptopic -  Used for configuring if ChanServ is to restore the channel topic when a channel is created.
  *   chanserv/set/peace - Used for configuring if users are able to kick other users with higher access than them.
  *   chanserv/set/persist - Used for setting whether ChanServ should stay in channels after the last user leaves.
@@ -1081,62 +1081,61 @@ cs_seen
  *   chanserv/set/securefounder - Used for setting whether users with founder level access in channels have true founder or not.
  *   chanserv/set/secureops - Used for restricting who can have channel op privilege in a channel to those whom have access in the channel.
  *   chanserv/set/signkick - Used for setting signkick, which appends the kicker's name to kicks sent through ChanServ.
- *   chanserv/set/successor - Used for setting channel successors, which become channel founders if the founders account expires.
+ *   chanserv/set/successor - Used for setting channel successors, which become channel founders if the founders' account expires.
  *   chanserv/saset/noexpire - Used for setting noexpire, which prevents channels from expiring.
  *
- * Is a dummy command to provide a help wrapper for the various SET commands.
+ * This is a dummy command to provide a help wrapper for the various SET and SASET commands.
  */
 module { name = "cs_set" }
 
-command { service = "ChanServ"; name = "SET"; command = "chanserv/set"; group = "chanserv/management" }
-command { service = "ChanServ"; name = "SASET"; command = "chanserv/saset"; permission = "chanserv/saset/"; group = "chanserv/admin" }
+command { service = "ChanServ"; name = "SET"; command = "chanserv/set"; group = "chanserv/management"; }
+command { service = "ChanServ"; name = "SASET"; command = "chanserv/saset"; permission = "chanserv/saset/"; group = "chanserv/admin"; }
 
-command { service = "ChanServ"; name = "SET AUTOOP"; command = "chanserv/set/autoop"; group = "chanserv/management" }
-command { service = "ChanServ"; name = "SASET AUTOOP"; command = "chanserv/set/autoop"; permission = "chanserv/saset/autoop"; group = "chanserv/admin" }
+command { service = "ChanServ"; name = "SET AUTOOP"; command = "chanserv/set/autoop"; group = "chanserv/management"; }
+command { service = "ChanServ"; name = "SASET AUTOOP"; command = "chanserv/set/autoop"; permission = "chanserv/saset/autoop"; group = "chanserv/admin"; }
 
-command { service = "ChanServ"; name = "SET BANTYPE"; command = "chanserv/set/bantype"; group = "chanserv/management"}
-command { service = "ChanServ"; name = "SASET BANTYPE"; command = "chanserv/set/bantype"; permission = "chanserv/saset/bantype"; group = "chanserv/admin" }
+command { service = "ChanServ"; name = "SET BANTYPE"; command = "chanserv/set/bantype"; group = "chanserv/management"; }
+command { service = "ChanServ"; name = "SASET BANTYPE"; command = "chanserv/set/bantype"; permission = "chanserv/saset/bantype"; group = "chanserv/admin"; }
 
-command { service = "ChanServ"; name = "SET DESCRIPTION"; command = "chanserv/set/description"; group = "chanserv/management" }
-command { service = "ChanServ"; name = "SET DESC"; command = "chanserv/set/description"; group = "chanserv/management" }
+command { service = "ChanServ"; name = "SET DESCRIPTION"; command = "chanserv/set/description"; group = "chanserv/management"; }
+command { service = "ChanServ"; name = "SET DESC"; command = "chanserv/set/description"; group = "chanserv/management"; }
+command { service = "ChanServ"; name = "SASET DESCRIPTION"; command = "chanserv/set/description"; permission = "chanserv/saset/description"; group = "chanserv/admin"; }
+command { service = "ChanServ"; name = "SASET DESC"; command = "chanserv/set/description"; permission = "chanserv/saset/description"; group = "chanserv/admin"; }
 
-command { service = "ChanServ"; name = "SASET DESCRIPTION"; command = "chanserv/set/description"; permission = "chanserv/saset/description"; group = "chanserv/admin" }
-command { service = "ChanServ"; name = "SASET DESC"; command = "chanserv/set/description"; permission = "chanserv/saset/description"; group = "chanserv/admin" }
+command { service = "ChanServ"; name = "SET FOUNDER"; command = "chanserv/set/founder"; group = "chanserv/management"; }
+command { service = "ChanServ"; name = "SASET FOUNDER"; command = "chanserv/set/founder"; permission = "chanserv/saset/founder"; group = "chanserv/admin"; }
 
-command { service = "ChanServ"; name = "SET FOUNDER"; command = "chanserv/set/founder"; group = "chanserv/management" }
-command { service = "ChanServ"; name = "SASET FOUNDER"; command = "chanserv/set/founder"; permission = "chanserv/saset/founder"; group = "chanserv/admin" }
+command { service = "ChanServ"; name = "SET KEEPTOPIC"; command = "chanserv/set/keeptopic"; group = "chanserv/management"; }
+command { service = "ChanServ"; name = "SASET KEEPTOPIC"; command = "chanserv/set/keeptopic"; permission = "chanserv/saset/keeptopic"; group = "chanserv/admin"; }
 
-command { service = "ChanServ"; name = "SET KEEPTOPIC"; command = "chanserv/set/keeptopic"; group = "chanserv/management" }
-command { service = "ChanServ"; name = "SASET KEEPTOPIC"; command = "chanserv/set/keeptopic"; permission = "chanserv/saset/keeptopic"; group = "chanserv/admin" }
+command { service = "ChanServ"; name = "SET PEACE"; command = "chanserv/set/peace"; group = "chanserv/management"; }
+command { service = "ChanServ"; name = "SASET PEACE"; command = "chanserv/set/peace"; permission = "chanserv/saset/peace"; group = "chanserv/admin"; }
 
-command { service = "ChanServ"; name = "SET PEACE"; command = "chanserv/set/peace"; group = "chanserv/management" }
-command { service = "ChanServ"; name = "SASET PEACE"; command = "chanserv/set/peace"; permission = "chanserv/saset/peace"; group = "chanserv/admin" }
+command { service = "ChanServ"; name = "SET PERSIST"; command = "chanserv/set/persist"; group = "chanserv/management"; }
+command { service = "ChanServ"; name = "SASET PERSIST"; command = "chanserv/set/persist"; permission = "chanserv/saset/persist"; group = "chanserv/admin"; }
 
-command { service = "ChanServ"; name = "SET PERSIST"; command = "chanserv/set/persist"; group = "chanserv/management" }
-command { service = "ChanServ"; name = "SASET PERSIST"; command = "chanserv/set/persist"; permission = "chanserv/saset/persist"; group = "chanserv/admin" }
+command { service = "ChanServ"; name = "SET PRIVATE"; command = "chanserv/set/private"; group = "chanserv/management"; }
+command { service = "ChanServ"; name = "SASET PRIVATE"; command = "chanserv/set/private"; permission = "chanserv/saset/private"; group = "chanserv/admin"; }
 
-command { service = "ChanServ"; name = "SET PRIVATE"; command = "chanserv/set/private"; group = "chanserv/management" }
-command { service = "ChanServ"; name = "SASET PRIVATE"; command = "chanserv/set/private"; permission = "chanserv/saset/private"; group = "chanserv/admin" }
+command { service = "ChanServ"; name = "SET RESTRICTED"; command = "chanserv/set/restricted"; group = "chanserv/management"; }
+command { service = "ChanServ"; name = "SASET RESTRICTED"; command = "chanserv/set/restricted"; permission = "chanserv/saset/restricted"; group = "chanserv/admin"; }
 
-command { service = "ChanServ"; name = "SET RESTRICTED"; command = "chanserv/set/restricted"; group = "chanserv/management" }
-command { service = "ChanServ"; name = "SASET RESTRICTED"; command = "chanserv/set/restricted"; permission = "chanserv/saset/restricted"; group = "chanserv/admin" }
+command { service = "ChanServ"; name = "SET SECURE"; command = "chanserv/set/secure"; group = "chanserv/management"; }
+command { service = "ChanServ"; name = "SASET SECURE"; command = "chanserv/set/secure"; permission = "chanserv/saset/secure"; group = "chanserv/admin"; }
 
-command { service = "ChanServ"; name = "SET SECURE"; command = "chanserv/set/secure"; group = "chanserv/management" }
-command { service = "ChanServ"; name = "SASET SECURE"; command = "chanserv/set/secure"; permission = "chanserv/saset/secure"; group = "chanserv/admin" }
+command { service = "ChanServ"; name = "SET SECUREFOUNDER"; command = "chanserv/set/securefounder"; group = "chanserv/management"; }
+command { service = "ChanServ"; name = "SASET SECUREFOUNDER"; command = "chanserv/set/securefounder"; permission = "chanserv/saset/securefounder"; group = "chanserv/admin"; }
 
-command { service = "ChanServ"; name = "SET SECUREFOUNDER"; command = "chanserv/set/securefounder"; group = "chanserv/management" }
-command { service = "ChanServ"; name = "SASET SECUREFOUNDER"; command = "chanserv/set/securefounder"; permission = "chanserv/saset/securefounder"; group = "chanserv/admin" }
+command { service = "ChanServ"; name = "SET SECUREOPS"; command = "chanserv/set/secureops"; group = "chanserv/management"; }
+command { service = "ChanServ"; name = "SASET SECUREOPS"; command = "chanserv/set/secureops"; permission = "chanserv/saset/secureops"; group = "chanserv/admin"; }
 
-command { service = "ChanServ"; name = "SET SECUREOPS"; command = "chanserv/set/secureops"; group = "chanserv/management" }
-command { service = "ChanServ"; name = "SASET SECUREOPS"; command = "chanserv/set/secureops"; permission = "chanserv/saset/secureops"; group = "chanserv/admin" }
+command { service = "ChanServ"; name = "SET SIGNKICK"; command = "chanserv/set/signkick"; group = "chanserv/management"; }
+command { service = "ChanServ"; name = "SASET SIGNKICK"; command = "chanserv/set/signkick"; permission = "chanserv/saset/signkick"; group = "chanserv/admin"; }
 
-command { service = "ChanServ"; name = "SET SIGNKICK"; command = "chanserv/set/signkick"; group = "chanserv/management" }
-command { service = "ChanServ"; name = "SASET SIGNKICK"; command = "chanserv/set/signkick"; permission = "chanserv/saset/signkick"; group = "chanserv/admin" }
+command { service = "ChanServ"; name = "SET SUCCESSOR"; command = "chanserv/set/successor"; group = "chanserv/management"; }
+command { service = "ChanServ"; name = "SASET SUCCESSOR"; command = "chanserv/set/successor"; permission = "chanserv/saset/successor"; group = "chanserv/admin"; }
 
-command { service = "ChanServ"; name = "SET SUCCESSOR"; command = "chanserv/set/successor"; group = "chanserv/management" }
-command { service = "ChanServ"; name = "SASET SUCCESSOR"; command = "chanserv/set/successor"; permission = "chanserv/saset/successor"; group = "chanserv/admin" }
-
-command { service = "ChanServ"; name = "SASET NOEXPIRE"; command = "chanserv/saset/noexpire"; permission = "chanserv/saset/noexpire"; group = "chanserv/admin" }
+command { service = "ChanServ"; name = "SASET NOEXPIRE"; command = "chanserv/saset/noexpire"; permission = "chanserv/saset/noexpire"; group = "chanserv/admin"; }
 
 /*
  * cs_set_misc
@@ -1144,11 +1143,13 @@ command { service = "ChanServ"; name = "SASET NOEXPIRE"; command = "chanserv/sas
  * Provides the command chanserv/set/misc.
  *
  * Allows you to create arbitrary commands to set data, and have that data show up in chanserv/info.
- * A field named misc_description may be given for use with help output. 
+ * A field named misc_description may be given for use with help output.
  */
 module { name = "cs_set_misc" }
-command { service = "ChanServ"; name = "SET URL"; command = "chanserv/set/misc"; group = "chanserv/management"; misc_description = _("Associate a URL with the channel") }
-command { service = "ChanServ"; name = "SET EMAIL"; command = "chanserv/set/misc"; group = "chanserv/management"; misc_description = _("Associate an E-mail address with the channel") }
+command { service = "ChanServ"; name = "SET URL"; command = "chanserv/set/misc"; group = "chanserv/management"; misc_description = _("Associate a URL with the channel"); }
+command { service = "ChanServ"; name = "SASET URL"; command = "chanserv/set/misc"; group = "chanserv/management"; misc_description = _("Associate a URL with the channel"); permission = "chanserv/saset/url"; group = "chanserv/admin"; }
+command { service = "ChanServ"; name = "SET EMAIL"; command = "chanserv/set/misc"; group = "chanserv/management"; misc_description = _("Associate an E-mail address with the channel"); }
+command { service = "ChanServ"; name = "SASET EMAIL"; command = "chanserv/set/misc"; group = "chanserv/management"; misc_description = _("Associate an E-mail address with the channel"); permission = "chanserv/saset/email"; group = "chanserv/admin"; }
 
 /*
  * cs_status
@@ -1169,8 +1170,8 @@ command { service = "ChanServ"; name = "STATUS"; command = "chanserv/status"; }
  * Used for suspending and unsuspending channels. Suspended channels can not be used but their settings are stored.
  */
 module { name = "cs_suspend" }
-command { service = "ChanServ"; name = "SUSPEND"; command = "chanserv/suspend"; permission = "chanserv/suspend"; group = "chanserv/admin" }
-command { service = "ChanServ"; name = "UNSUSPEND"; command = "chanserv/unsuspend"; permission = "chanserv/suspend"; group = "chanserv/admin" }
+command { service = "ChanServ"; name = "SUSPEND"; command = "chanserv/suspend"; permission = "chanserv/suspend"; group = "chanserv/admin"; }
+command { service = "ChanServ"; name = "UNSUSPEND"; command = "chanserv/unsuspend"; permission = "chanserv/suspend"; group = "chanserv/admin"; }
 
 /*
  * cs_sync
@@ -1180,17 +1181,17 @@ command { service = "ChanServ"; name = "UNSUSPEND"; command = "chanserv/unsuspen
  * Used to sync users channel status modes with what access they have.
  */
 module { name = "cs_sync" }
-command { service = "ChanServ"; name = "SYNC"; command = "chanserv/sync"; group = "chanserv/management" }
+command { service = "ChanServ"; name = "SYNC"; command = "chanserv/sync"; group = "chanserv/management"; }
 
 /*
  * cs_topic
  *
  * Provides the command chanserv/topic.
  *
- * Used for changing the channel topic. Usedful in conjunction with chanserv/set/topiclock.
+ * Used for changing the channel topic. Useful in conjunction with chanserv/set/topiclock.
  */
 module { name = "cs_topic" }
-command { service = "ChanServ"; name = "TOPIC"; command = "chanserv/topic"; group = "chanserv/management" }
+command { service = "ChanServ"; name = "TOPIC"; command = "chanserv/topic"; group = "chanserv/management"; }
 
 /*
  * cs_unban
@@ -1210,8 +1211,8 @@ command { service = "ChanServ"; name = "UNBAN"; command = "chanserv/unban"; }
  * Used for setting or removing your status modes on a channel.
  */
 module { name = "cs_updown" }
-command { service = "ChanServ"; name = "DOWN"; command = "chanserv/down"; group = "chanserv/status" }
-command { service = "ChanServ"; name = "UP"; command = "chanserv/up"; group = "chanserv/status" }
+command { service = "ChanServ"; name = "DOWN"; command = "chanserv/down"; group = "chanserv/status"; }
+command { service = "ChanServ"; name = "UP"; command = "chanserv/up"; group = "chanserv/status"; }
 
 /*
  * cs_xop
@@ -1222,14 +1223,16 @@ command { service = "ChanServ"; name = "UP"; command = "chanserv/up"; group = "c
  * Used for giving users access in channels.
  */
 module { name = "cs_xop" }
-command { service = "ChanServ"; name = "QOP"; command = "chanserv/qop"; group = "chanserv/access" }
-command { service = "ChanServ"; name = "SOP"; command = "chanserv/sop"; group = "chanserv/access" }
-command { service = "ChanServ"; name = "AOP"; command = "chanserv/aop"; group = "chanserv/access" }
-command { service = "ChanServ"; name = "HOP"; command = "chanserv/hop"; group = "chanserv/access" }
-command { service = "ChanServ"; name = "VOP"; command = "chanserv/vop"; group = "chanserv/access"  }
+command { service = "ChanServ"; name = "QOP"; command = "chanserv/qop"; group = "chanserv/access"; }
+command { service = "ChanServ"; name = "SOP"; command = "chanserv/sop"; group = "chanserv/access"; }
+command { service = "ChanServ"; name = "AOP"; command = "chanserv/aop"; group = "chanserv/access"; }
+command { service = "ChanServ"; name = "HOP"; command = "chanserv/hop"; group = "chanserv/access"; }
+command { service = "ChanServ"; name = "VOP"; command = "chanserv/vop"; group = "chanserv/access"; }
+
 
 /* Use m_rewrite to rewrite the op, deop, etc. commands (see modules.conf). */
 
+/* OWNER and DEOWNER commands */
 command
 {
 	service = "ChanServ"; name = "OWNER"; command = "rewrite"; group = "chanserv/status"
@@ -1238,7 +1241,7 @@ command
 	rewrite_source = "OWNER $"
 	rewrite_target = "MODE $1 SET +q $2"
 
-	rewrite_description = _("Gives you owner status on channel")
+	rewrite_description = _("Gives you or a specified nick owner status on a channel")
 }
 command
 {
@@ -1247,10 +1250,11 @@ command
 	rewrite = true
 	rewrite_source = "DEOWNER $"
 	rewrite_target = "MODE $1 SET -q $2"
-	
-	rewrite_description = _("Removes your owner status on a channel")
+
+	rewrite_description = _("Removes owner status from you or a specified nick on a channel")
 }
 
+/* PROTECT and DEPROTECT commands */
 command
 {
 	service = "ChanServ"; name = "PROTECT"; command = "rewrite"; group = "chanserv/status"
@@ -1258,8 +1262,8 @@ command
 	rewrite = true
 	rewrite_source = "PROTECT $"
 	rewrite_target = "MODE $1 SET +a $2"
-	
-	rewrite_description = _("Protects a selected nick on a channel")
+
+	rewrite_description = _("Protects you or a specified nick on a channel")
 }
 command
 {
@@ -1268,10 +1272,11 @@ command
 	rewrite = true
 	rewrite_source = "DEPROTECT $"
 	rewrite_target = "MODE $1 SET -a $2"
-	
-	rewrite_description = _("Deprotects a selected nick on a channel")
+
+	rewrite_description = _("Deprotects you or a specified nick on a channel")
 }
 
+/* OP and DEOP commands */
 command
 {
 	service = "ChanServ"; name = "OP"; command = "rewrite"; group = "chanserv/status"
@@ -1279,10 +1284,9 @@ command
 	rewrite = true
 	rewrite_source = "OP $"
 	rewrite_target = "MODE $1 SET +o $2"
-	
-	rewrite_description = _("Gives Op status to a selected nick on a channel")
-}
 
+	rewrite_description = _("Gives operator status to you or a specified nick on a channel")
+}
 command
 {
 	service = "ChanServ"; name = "DEOP"; command = "rewrite"; group = "chanserv/status"
@@ -1290,8 +1294,8 @@ command
 	rewrite = true
 	rewrite_source = "DEOP $"
 	rewrite_target = "MODE $1 SET -o $2";
-	
-	rewrite_description = _("Deops a selected nick on a channel")
+
+	rewrite_description = _("Deops you or a specified nick on a channel")
 }
 
 /* HALFOP and DEHALFOP commands */
@@ -1302,8 +1306,8 @@ command
 	rewrite = true
 	rewrite_source = "HALFOP $"
 	rewrite_target = "MODE $1 SET +h $2"
-	
-	rewrite_description = _("Halfops a selected nick on a channel")
+
+	rewrite_description = _("Halfops you or a specified nick on a channel")
 
 }
 command
@@ -1313,8 +1317,8 @@ command
 	rewrite = true
 	rewrite_source = "DEHALFOP $"
 	rewrite_target = "MODE $1 SET -h $2"
-	
-	rewrite_description = _("Dehalfops a selected nick on a channel")
+
+	rewrite_description = _("Dehalfops you or a specified nick on a channel")
 }
 
 /* VOICE and DEVOICE commands */
@@ -1325,10 +1329,9 @@ command
 	rewrite = true
 	rewrite_source = "VOICE $"
 	rewrite_target = "MODE $1 SET +v $2"
-	
-	rewrite_description = _("Voices a selected nick on a channel")
-}
 
+	rewrite_description = _("Voices you or a specified nick on a channel")
+}
 command
 {
 	service = "ChanServ"; name = "DEVOICE"; command = "rewrite"; group = "chanserv/status"
@@ -1337,7 +1340,7 @@ command
 	rewrite_source = "DEVOICE $"
 	rewrite_target = "MODE $1 SET -v $2"
 
-	rewrite_description = _("Devoices a selected nick on a channel")
+	rewrite_description = _("Devoices you or a specified nick on a channel")
 }
 
 
@@ -1352,4 +1355,3 @@ command
  * channel's access list is modified.
  */
 module { name = "cs_statusupdate" }
-