1 files changed, 32 insertions, 24 deletions

diff --git a/data/botserv.example.conf b/data/botserv.example.conf
index fbb8f166d..817188bc8 100644
--- a/data/botserv.example.conf
+++ b/data/botserv.example.conf
@@ -52,13 +52,21 @@ service
 	#modes = "+o"
 
 	/*
-	 * An optional comma separated list of channels this service should join. Outside
-	 * 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.
+	 * Channels this service should join. Outside 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 characters or prefix symbols.
+	 * Status modes mave be given for the channel in the form of mode characters or prefix symbols.
 	 */
-	#channels = "@#services,#mychan"
+	channel
+	{
+		modes = "o"
+		name = "#services"
+	}
+
+	channel
+	{
+		name = "#mychan"
+	}
 }
 
 /*
@@ -68,7 +76,7 @@ service
  */
 module
 {
-	name = "botserv"
+	name = "botserv/main"
 
 	/*
 	 * The name of the client that should be BotServ.
@@ -140,7 +148,7 @@ module
 command { service = "BotServ"; name = "HELP"; command = "generic/help"; }
 
 /*
- * bs_assign
+ * botserv/gassign
  *
  * Provides the commands:
  *   botserv/assign - Used to assign BotServ bots to channels
@@ -149,19 +157,19 @@ command { service = "BotServ"; name = "HELP"; command = "generic/help"; }
  *
  * Used for assigning and unassigning bots to channels.
  */
-module { name = "bs_assign" }
+module { name = "botserv/assign" }
 command { service = "BotServ"; name = "ASSIGN"; command = "botserv/assign"; }
 command { service = "BotServ"; name = "UNASSIGN"; command = "botserv/unassign"; }
 command { service = "BotServ"; name = "SET NOBOT"; command = "botserv/set/nobot"; permission = "botserv/set/nobot"; }
 
 /*
- * bs_autoassign
+ * botserv/gautoassign
  *
  * Allows service bots to be automatically assigned to channels upon registration.
  */
 #module
 {
-	name = "bs_autoassign"
+	name = "botserv/autoassign"
 
 	/*
 	 * Automatically assign ChanServ to channels upon registration.
@@ -170,7 +178,7 @@ command { service = "BotServ"; name = "SET NOBOT"; command = "botserv/set/nobot"
 }
 
 /*
- * bs_badwords
+ * botserv/gbadwords
  *
  * Provides the command botserv/badwords.
  *
@@ -178,7 +186,7 @@ command { service = "BotServ"; name = "SET NOBOT"; command = "botserv/set/nobot"
  */
 module
 {
-	name = "bs_badwords"
+	name = "botserv/badwords"
 
 	/*
 	 * The maximum number of entries a single bad words list can have.
@@ -195,48 +203,48 @@ module
 command { service = "BotServ"; name = "BADWORDS"; command = "botserv/badwords"; }
 
 /*
- * bs_bot
+ * botserv/gbot
  *
  * Provides the command botserv/bot.
  *
  * Used for administrating BotServ bots.
  */
-module { name = "bs_bot" }
+module { name = "botserv/gbot" }
 command { service = "BotServ"; name = "BOT"; command = "botserv/bot"; permission = "botserv/bot"; }
 
 /*
- * bs_botlist
+ * botserv/gbotlist
  *
  * Provides the command botserv/botlist.
  *
  * Used for listing all available bots.
  */
-module { name = "bs_botlist" }
+module { name = "botserv/gbotlist" }
 command { service = "BotServ"; name = "BOTLIST"; command = "botserv/botlist"; }
 
 /*
- * bs_control
+ * botserv/gcontrol
  *
  * Provides the commands botserv/act and botserv/say.
  *
  * Used for making the bot message a channel.
  */
-module { name = "bs_control" }
+module { name = "botserv/gcontrol" }
 command { service = "BotServ"; name = "ACT"; command = "botserv/act"; }
 command { service = "BotServ"; name = "SAY"; command = "botserv/say"; }
 
 /*
- * bs_info
+ * botserv/ginfo
  *
  * Provides the command botserv/info.
  *
  * Used for getting information on bots or channels.
  */
-module { name = "bs_info" }
+module { name = "botserv/ginfo" }
 command { service = "BotServ"; name = "INFO"; command = "botserv/info"; }
 
 /*
- * bs_kick
+ * botserv/gkick
  *
  * Provides the commands:
  *   botserv/kick - Dummy help wrapper for the KICK command.
@@ -257,7 +265,7 @@ command { service = "BotServ"; name = "INFO"; command = "botserv/info"; }
  */
 module
 {
-	name = "bs_kick"
+	name = "botserv/gkick"
 
 	/*
 	 * The amount of time that data for a user is valid in BotServ. If the data exceeds this time,
@@ -291,12 +299,12 @@ command { service = "BotServ"; name = "SET DONTKICKVOICES"; command = "botserv/s
 
 
 /*
- * bs_set
+ * botserv/gset
  *
  * Provides the commands:
  *   botserv/set/private - Used to prohibit specific BotServ bots from being assigned to channels.
  */
-module { name = "bs_set" }
+module { name = "botserv/gset" }
 command { service = "BotServ"; name = "SET"; command = "botserv/set"; }
 command { service = "BotServ"; name = "SET BANEXPIRE"; command = "botserv/set/banexpire"; }
 command { service = "BotServ"; name = "SET PRIVATE"; command = "botserv/set/private"; permission = "botserv/set/private"; }