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, 38 insertions, 37 deletions

diff --git a/data/nickserv.example.conf b/data/nickserv.example.conf
index 944aa863a..1030f08f5 100644
--- a/data/nickserv.example.conf
+++ b/data/nickserv.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"
 }
@@ -70,7 +70,7 @@ nickserv
 
 	/*
 	 * Force users to give an e-mail address when they register a nick.
-	 * 
+	 *
 	 * This directive is recommended to be enabled, and required if e-mail registration is enabled.
 	 */
 	forceemail = yes
@@ -89,11 +89,11 @@ nickserv
 	registration = "none"
 
 	/*
-	 * A message sent to users on connect if they user an unregistered nick.
+	 * A message sent to users on connect if they use an unregistered nick.
 	 *
 	 * This directive is optional.
 	 */
-	#unregistered_notice = "Your nickname is not registered. To register it use /nickserv register password email."
+	#unregistered_notice = "Your nickname is not registered. To register it, use: /msg NickServ REGISTER password email"
 
 	/*
 	 * The default options for newly registered nicks. Note that changing these options
@@ -113,8 +113,8 @@ nickserv
 	 * -  memo_signon: Notify user if they have a new memo when they sign into the nick
 	 * - memo_receive: Notify user if they have a new memo as soon as it's received
 	 * -       autoop: User will be automatically opped in channels they enter and have access to
-	 * -          msg: Services messages will be sent as PRIVMSGs instead of NOTICEs, requires UsePrivmsg
-	 *                   to be enabled as well
+	 * -          msg: Services messages will be sent as PRIVMSGs instead of NOTICEs, requires
+	 *                   options:useprivmsg to be enabled as well
 	 *
 	 * This directive is optional, if left blank, the options will default to secure, memo_signon, and
 	 * memo_receive. If you really want no defaults, use "none" by itself as the option.
@@ -150,7 +150,7 @@ nickserv
 	resenddelay = 90s
 
 	/*
-	 * The length of time before a nick registration expires.
+	 * The length of time before a nick's registration expires.
 	 *
 	 * This directive is optional, but recommended. If not set, the default is 21 days.
 	 */
@@ -159,7 +159,7 @@ nickserv
 	/*
 	 * The length of time before a suspended nick becomes unsuspended.
 	 *
-	 * This directive is optional. If not set, the default is to never.
+	 * This directive is optional. If not set, the default is never.
 	 */
 	#suspendexpire = 90d
 
@@ -185,7 +185,7 @@ nickserv
 
 	/*
 	 * The username (and possibly hostname) used for the fake user created when NickServ collides
-	 * a user. Should be in the user@host format.
+	 * a user.
 	 */
 	enforceruser = "enforcer"
 	enforcerhost = "localhost.net"
@@ -232,7 +232,7 @@ nickserv
 
 	/*
 	 * If set, any user wanting to use the privileges of Services Root, Services Admin, or Services
-	 * Operator must have been logged as an IRC Operator with the /oper command.
+	 * Operator must have been logged as an IRC Operator with the /OPER command.
 	 *
 	 * This directive is optional, but recommended.
 	 */
@@ -303,7 +303,7 @@ nickserv
  *
  * Additionally, you may provide a permission name that must be in the opertype of users executing the command.
  *
- * Sane defaults are provided below that do not need to be edited unless you wish to change the default behaviour.
+ * Sane defaults are provided below that do not need to be edited unless you wish to change the default behavior.
  */
 
 /* Command group configuration for NickServ.
@@ -313,7 +313,7 @@ nickserv
  */
 command_group
 {
-	name = "nickserv/admin";
+	name = "nickserv/admin"
 	description = "Services Operator commands"
 }
 
@@ -378,7 +378,7 @@ command { service = "NickServ"; name = "DROP"; command = "nickserv/drop"; }
  * Used for getting registered accounts by searching for emails.
  */
 module { name = "ns_getemail" }
-command { service = "NickServ"; name = "GETEMAIL"; command = "nickserv/getemail"; permission = "nickserv/getemail"; group = "nickserv/admin" }
+command { service = "NickServ"; name = "GETEMAIL"; command = "nickserv/getemail"; permission = "nickserv/getemail"; group = "nickserv/admin"; }
 
 /*
  * ns_getpass
@@ -412,7 +412,7 @@ command { service = "NickServ"; name = "UNGROUP"; command = "nickserv/ungroup";
  * Used for identifying to accounts.
  */
 module { name = "ns_identify" }
-command { service = "NickServ"; name = "ID"; command = "nickserv/identify"; hide = true }
+command { service = "NickServ"; name = "ID"; command = "nickserv/identify"; hide = true; }
 command { service = "NickServ"; name = "IDENTIFY"; command = "nickserv/identify"; }
 
 /*
@@ -433,7 +433,7 @@ command { service = "NickServ"; name = "INFO"; command = "nickserv/info"; }
  * Used for retrieving and searching the registered account list.
  */
 module { name = "ns_list" }
-command { service = "NickServ"; name = "LIST"; command = "nickserv/list"; command = "nickserv/admin" }
+command { service = "NickServ"; name = "LIST"; command = "nickserv/list"; command = "nickserv/admin"; }
 
 /*
  * ns_logout
@@ -494,51 +494,51 @@ command { service = "NickServ"; name = "RESETPASS"; command = "nickserv/resetpas
  *   nickserv/set/language, nickserv/saset/language - Used for configuring what language services use.
  *   nickserv/set/message, nickserv/saset/message - Used to configure how services send messages to you.
  *   nickserv/set/password, nickserv/saset/password  - Used for changing a users greet password.
- *   nickserv/set/private, nickserv/saset/privatee - Used for configuring whether or a users account shows up in nickserv/list.
+ *   nickserv/set/private, nickserv/saset/private - Used for configuring whether or a users account shows up in nickserv/list.
  *   nickserv/set/secure, nickserv/saset/secure - Used for configuring whether a user can identify by simply being recognized by nickserv/access.
  *   nickserv/saset/noexpire - Used for configuring noexpire, which prevents nicks from expiring.
  *
- * Used as a help wrapper for the SET and SASET commands, and provides many other set commands.
+ * This is a dummy command to provide a help wrapper for the various SET and SASET commands.
  */
 module { name = "ns_set" }
 
 command { service = "NickServ"; name = "SET"; command = "nickserv/set"; }
-command { service = "NickServ"; name = "SASET"; command = "nickserv/saset"; permission = "nickserv/saset/"; group = "nickserv/admin" }
+command { service = "NickServ"; name = "SASET"; command = "nickserv/saset"; permission = "nickserv/saset/"; group = "nickserv/admin"; }
 
 command { service = "NickServ"; name = "SET AUTOOP"; command = "nickserv/set/autoop"; }
-command { service = "NickServ"; name = "SASET AUTOOP"; command = "nickserv/saset/autoop"; permission = "nickserv/saset/autoop"; group = "nickserv/admin" }
+command { service = "NickServ"; name = "SASET AUTOOP"; command = "nickserv/saset/autoop"; permission = "nickserv/saset/autoop"; group = "nickserv/admin"; }
 
 command { service = "NickServ"; name = "SET DISPLAY"; command = "nickserv/set/display"; }
-command { service = "NickServ"; name = "SASET DISPLAY"; command = "nickserv/saset/display"; permission = "nickserv/saset/display"; group = "nickserv/admin" }
+command { service = "NickServ"; name = "SASET DISPLAY"; command = "nickserv/saset/display"; permission = "nickserv/saset/display"; group = "nickserv/admin"; }
 
 command { service = "NickServ"; name = "SET EMAIL"; command = "nickserv/set/email"; }
-command { service = "NickServ"; name = "SASET EMAIL"; command = "nickserv/saset/email"; permission = "nickserv/saset/email"; group = "nickserv/admin" }
+command { service = "NickServ"; name = "SASET EMAIL"; command = "nickserv/saset/email"; permission = "nickserv/saset/email"; group = "nickserv/admin"; }
 
 command { service = "NickServ"; name = "SET GREET"; command = "nickserv/set/greet"; }
-command { service = "NickServ"; name = "SASET GREET"; command = "nickserv/saset/greet"; permission = "nickserv/saset/greet"; group = "nickserv/admin" }
+command { service = "NickServ"; name = "SASET GREET"; command = "nickserv/saset/greet"; permission = "nickserv/saset/greet"; group = "nickserv/admin"; }
 
 command { service = "NickServ"; name = "SET HIDE"; command = "nickserv/set/hide"; }
-command { service = "NickServ"; name = "SASET HIDE"; command = "nickserv/saset/hide"; permission = "nickserv/saset/hide"; group = "nickserv/admin" }
+command { service = "NickServ"; name = "SASET HIDE"; command = "nickserv/saset/hide"; permission = "nickserv/saset/hide"; group = "nickserv/admin"; }
 
 command { service = "NickServ"; name = "SET KILL"; command = "nickserv/set/kill"; }
-command { service = "NickServ"; name = "SASET KILL"; command = "nickserv/saset/kill"; permission = "nickserv/saset/kill";  group = "nickserv/admin" }
+command { service = "NickServ"; name = "SASET KILL"; command = "nickserv/saset/kill"; permission = "nickserv/saset/kill";  group = "nickserv/admin"; }
 
 command { service = "NickServ"; name = "SET LANGUAGE"; command = "nickserv/set/language"; }
-command { service = "NickServ"; name = "SASET LANGUAGE"; command = "nickserv/saset/language"; permission = "nickserv/saset/language"; group = "nickserv/admin" }
+command { service = "NickServ"; name = "SASET LANGUAGE"; command = "nickserv/saset/language"; permission = "nickserv/saset/language"; group = "nickserv/admin"; }
 
 command { service = "NickServ"; name = "SET MESSAGE"; command = "nickserv/set/message"; }
-command { service = "NickServ"; name = "SASET MESSAGE"; command = "nickserv/saset/message"; permission = "nickserv/saset/message"; group = "nickserv/admin" }
+command { service = "NickServ"; name = "SASET MESSAGE"; command = "nickserv/saset/message"; permission = "nickserv/saset/message"; group = "nickserv/admin"; }
 
 command { service = "NickServ"; name = "SET PASSWORD"; command = "nickserv/set/password"; }
-command { service = "NickServ"; name = "SASET PASSWORD"; command = "nickserv/saset/password"; permission = "nickserv/saset/password"; group = "nickserv/admin" }
+command { service = "NickServ"; name = "SASET PASSWORD"; command = "nickserv/saset/password"; permission = "nickserv/saset/password"; group = "nickserv/admin"; }
 
 command { service = "NickServ"; name = "SET PRIVATE"; command = "nickserv/set/private"; }
-command { service = "NickServ"; name = "SASET PRIVATE"; command = "nickserv/saset/private"; permission = "nickserv/saset/private"; group = "nickserv/admin" }
+command { service = "NickServ"; name = "SASET PRIVATE"; command = "nickserv/saset/private"; permission = "nickserv/saset/private"; group = "nickserv/admin"; }
 
 command { service = "NickServ"; name = "SET SECURE"; command = "nickserv/set/secure"; }
-command { service = "NickServ"; name = "SASET SECURE"; command = "nickserv/saset/secure"; permission = "nickserv/saset/secure"; group = "nickserv/admin" }
+command { service = "NickServ"; name = "SASET SECURE"; command = "nickserv/saset/secure"; permission = "nickserv/saset/secure"; group = "nickserv/admin"; }
 
-command { service = "NickServ"; name = "SASET NOEXPIRE"; command = "nickserv/saset/noexpire"; permission = "nickserv/saset/noexpire"; group = "nickserv/admin" }
+command { service = "NickServ"; name = "SASET NOEXPIRE"; command = "nickserv/saset/noexpire"; permission = "nickserv/saset/noexpire"; group = "nickserv/admin"; }
 
 /*
  * ns_set_misc
@@ -549,7 +549,8 @@ command { service = "NickServ"; name = "SASET NOEXPIRE"; command = "nickserv/sas
  * A field named misc_description may be given for use with help output.
  */
 module { name = "ns_set_misc" }
-command { service = "NickServ"; name = "SET URL"; command = "nickserv/set/misc"; misc_description = _("Associate a URL with your account") }
+command { service = "NickServ"; name = "SET URL"; command = "nickserv/set/misc"; misc_description = _("Associate a URL with your account"); }
+command { service = "NickServ"; name = "SASET URL"; command = "nickserv/saset/misc"; misc_description = _("Associate a URL with this account"); permission = "nickserv/saset/url"; group = "nickserv/admin"; }
 #command { service = "NickServ"; name = "SET ICQ"; command = "nickserv/set/misc"; }
 #command { service = "NickServ"; name = "SET TWITTER"; command = "nickserv/set/misc"; }
 #command { service = "NickServ"; name = "SET FACEBOOK"; command = "nickserv/set/misc"; }
@@ -569,11 +570,11 @@ command { service = "NickServ"; name = "STATUS"; command = "nickserv/status"; }
  *
  * Provides the commands nickserv/suspend and nickserv/unsuspend.
  *
- * Used to suspend and unsuspend nicknames. Suspended nicknames can not be used but their settings are stored.
+ * Used to suspend and unsuspend nicknames. Suspended nicknames can not be used but their settings are preserved.
  */
 module { name = "ns_suspend" }
-command { service = "NickServ"; name = "SUSPEND"; command = "nickserv/suspend"; permission = "nickserv/suspend"; group = "nickserv/admin" }
-command { service = "NickServ"; name = "UNSUSPEND"; command = "nickserv/unsuspend"; permission = "nickserv/suspend"; group = "nickserv/admin" }
+command { service = "NickServ"; name = "SUSPEND"; command = "nickserv/suspend"; permission = "nickserv/suspend"; group = "nickserv/admin"; }
+command { service = "NickServ"; name = "UNSUSPEND"; command = "nickserv/unsuspend"; permission = "nickserv/suspend"; group = "nickserv/admin"; }
 
 /*
  * ns_update
@@ -585,6 +586,7 @@ command { service = "NickServ"; name = "UNSUSPEND"; command = "nickserv/unsuspen
 module { name = "ns_update" }
 command { service = "NickServ"; name = "UPDATE"; command = "nickserv/update"; }
 
+
 /*
  * Extra NickServ related modules.
  */
@@ -605,4 +607,3 @@ ns_maxemail
 	 */
 	#maxemails = 1
 }
-