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, 59 insertions, 54 deletions

diff --git a/data/modules.example.conf b/data/modules.example.conf
index ce864f4f9..350c85193 100644
--- a/data/modules.example.conf
+++ b/data/modules.example.conf
@@ -1,4 +1,3 @@
-
 /*
  * [OPTIONAL] Non-Core Modules
  *
@@ -12,7 +11,7 @@
  *
  * Provides commands generic/help
  *
- * Is a generic help command that can be used with any client.
+ * This is a generic help command that can be used with any client.
  */
 module { name = "help" }
 
@@ -25,19 +24,20 @@ module { name = "help" }
 #module { name = "m_dns" }
 dns
 {
-	/* 
+	/*
 	 * The nameserver to use for resolving hostnames, must be an IP or a resolver configuration file.
 	 * The below should work fine on all unix like systems. Windows users will have to find their nameservers
-	 * from ipconfig /all and put the IP here
+	 * from ipconfig /all and put the IP here.
 	 */
 	nameserver = "/etc/resolv.conf"
 	#nameserver = "127.0.0.1"
 
 	/*
-	 * How long to wait in seconds before a DNS query has timed out
+	 * How long to wait in seconds before a DNS query has timed out.
 	 */
 	timeout = 5
 
+
 	/* Only edit below if you are expecting to use os_dns or otherwise answer DNS queries. */
 
 	/*
@@ -50,16 +50,21 @@ dns
 	ip = "0.0.0.0"
 	port = 53
 
+
 	/*
 	 * SOA record information.
 	 */
-	 admin = "admin@example.com"
-	 /* This should be the names of the public facing nameserver serving the records */
-	 nameservers = "ns1.example.com ns2.example.com"
-	 /* The time slave servers are allowed to cache. This should be reasonably low
-	  * if you want your records to be updated without much delay.
-	  */
-	 refresh = 3600
+
+	/* E-mail address of the DNS administrator. */
+	admin = "admin@example.com"
+
+	/* This should be the names of the public facing nameservers serving the records. */
+	nameservers = "ns1.example.com ns2.example.com"
+
+	/* The time slave servers are allowed to cache. This should be reasonably low
+	 * if you want your records to be updated without much delay.
+	 */
+	refresh = 3600
 }
 
 /*
@@ -94,10 +99,10 @@ m_dnsbl
 }
 blacklist
 {
-	/* Name of the blacklist */
+	/* Name of the blacklist. */
 	name = "rbl.efnetrbl.org"
 
-	/* How long to set the ban for */
+	/* How long to set the ban for. */
 	time = 4h
 
 	/* Reason for akill.
@@ -111,7 +116,7 @@ blacklist
 	 */
 	reason = "You are listed in the efnet RBL, visit http://rbl.efnetrbl.org/?i=%i for info"
 
-	/* Replies to ban and their reason. If this is totally ommited all replies get banned */
+	/* Replies to ban and their reason. If this is totally ommited all replies get banned. */
 	1 = "Open Proxy"
 	/* Don't ban for result 2 or 3 */
 	#2 = "spamtrap666"
@@ -150,13 +155,16 @@ httpd
 {
 	/* Name of this service */
 	name = "httpd/main"
-	
+
 	/* IP to listen on */
 	ip = "0.0.0.0"
+
 	/* Port to listen on */
 	port = 8080
+
 	/* Time before connections to this server are timed out */
 	timeout = 30
+
 	/* Listen using SSL. Requires m_ssl. */
 	#ssl = yes
 
@@ -205,14 +213,14 @@ m_ldap_authentication
 
 	/*
 	 * The search filter used to look up users's accounts.
-	 * %account is replaced with the user's account
+	 * %account is replaced with the user's account.
 	 * %object_class is replaced with the object_class configured below.
 	 */
 	search_filter = "(&(uid=%account)(objectClass=%object_class))"
 
 	/*
 	 * The object class used by LDAP to store user account information.
-	 * Used for adding new users to LDAP if disable_ns_register is false
+	 * Used for adding new users to LDAP if disable_ns_register is false.
 	 */
 	object_class = "anopeUser"
 
@@ -242,7 +250,7 @@ m_ldap_authentication
 	 * The reason to give the users who try to /ns register if
 	 * disable_ns_register is enabled.
 	 */
-	#disable_reason = "To register on this network visit http://some.misconfigured.site/register"
+	#disable_reason = "To register on this network, visit http://some.misconfigured.site/register"
 }
 
 /*
@@ -323,7 +331,7 @@ m_proxyscan
 	 * avaiable IP that remote proxies can connect to.
 	 */
 	#target_ip = "127.0.0.1"
-	
+
 	/*
 	 * The port services tells the proxy to connect to.
 	 */
@@ -344,7 +352,7 @@ m_proxyscan
 	/*
 	 * An optional notice sent to clients upon connect.
 	 */
-	#connect_notice = "We will now scan your host for insecure proxies. If you do not consent to this scan please disconnect immediately"
+	#connect_notice = "We will now scan your host for insecure proxies. If you do not consent to this scan please disconnect immediately."
 
 	/*
 	 * Who the notice should be sent from.
@@ -353,7 +361,7 @@ m_proxyscan
 
 	/*
 	 * If set, OperServ will add infected clients to the akill list. Without it, OperServ simply sends
-	 * a timed G/K-line to the IRCd and forgets about it. Can be useful if your akill list is being fill up by bots.
+	 * a timed G/K-line to the IRCd and forgets about it. Can be useful if your akill list is being filled up by bots.
 	 */
 	add_to_akill = yes
 
@@ -400,28 +408,28 @@ m_sql_authentication
 	engine = "mysql/main"
 
 	/* Query to execute to authenticate. A non empty result from this query is considered a success,
-	* and the user will be authenticated.
-	* 
-	* @a@ is replaced with the user's account name
-	* @p@ is replaced with the user's password
-	* @n@ is replaced with the user's nickname
-	* @i@ is replaced with the user's IP
-	*
-	* Note that @n@ and @i@ may not always exist in the case of a user identifying outside of the normal
-	* nickserv/identify command, such as through the web panel.
-	*
-	* Furthermore, if a field named email is returned from this query the user's email is
-	* set to its value.
-	*
-	*
-	* We've included some example queries for some popular website/forum systems.
-	*
-	* Drupal 6: "SELECT `mail` AS `email` FROM `users` WHERE `name` = @a@ AND `pass` = MD5(@p@) AND `status` = 1"
-	* e107 cms: "SELECT `user_email` AS `email` FROM `e107_user` WHERE `user_loginname` = @a@ AND `user_password` = MD5(@p@)"
-	* SMF Forum: "SELECT `email_address` AS `email` FROM `smf_members` WHERE `member_name` = @a@ AND `passwd` = SHA1(CONCAT(LOWER(@a@), @p@))"
-	* vBulletin: "SELECT `email` FROM `user` WHERE `username` = @a@ AND `password` = MD5(CONCAT(MD5(@p@), `salt`))"
-	* IP.Board: "SELECT `email` FROM `ibf_members` WHERE `name` = @a@ AND `members_pass_hash` = MD5(CONCAT(MD5(`members_pass_salt`), MD5(@p@)))"
-	*/
+	 * and the user will be authenticated.
+	 *
+	 * @a@ is replaced with the user's account name
+	 * @p@ is replaced with the user's password
+	 * @n@ is replaced with the user's nickname
+	 * @i@ is replaced with the user's IP
+	 *
+	 * Note that @n@ and @i@ may not always exist in the case of a user identifying outside of the normal
+	 * nickserv/identify command, such as through the web panel.
+	 *
+	 * Furthermore, if a field named email is returned from this query the user's email is
+	 * set to its value.
+	 *
+	 *
+	 * We've included some example queries for some popular website/forum systems.
+	 *
+	 * Drupal 6: "SELECT `mail` AS `email` FROM `users` WHERE `name` = @a@ AND `pass` = MD5(@p@) AND `status` = 1"
+	 * e107 cms: "SELECT `user_email` AS `email` FROM `e107_user` WHERE `user_loginname` = @a@ AND `user_password` = MD5(@p@)"
+	 * SMF Forum: "SELECT `email_address` AS `email` FROM `smf_members` WHERE `member_name` = @a@ AND `passwd` = SHA1(CONCAT(LOWER(@a@), @p@))"
+	 * vBulletin: "SELECT `email` FROM `user` WHERE `username` = @a@ AND `password` = MD5(CONCAT(MD5(@p@), `salt`))"
+	 * IP.Board: "SELECT `email` FROM `ibf_members` WHERE `name` = @a@ AND `members_pass_hash` = MD5(CONCAT(MD5(`members_pass_salt`), MD5(@p@)))"
+	 */
 	query = "SELECT `email_addr` AS `email` FROM `my_users` WHERE `username` = @a@ AND `password` = MD5(CONCAT('salt', @p@))"
 
 	/*
@@ -439,7 +447,7 @@ m_sql_authentication
 /*
  * m_sql_oper
  *
- * This module allows granting users services operator privileges and possibly IRC operator
+ * This module allows granting users services operator privileges and possibly IRC Operator
  * privileges based on an external SQL database using a custom query.
  */
 #module { name = "m_sql_oper" }
@@ -458,7 +466,7 @@ m_sql_oper
 	 * @a@ is replaced with the user's account name
 	 * @i@ is replaced with the user's IP
 	 */
-	 query = "SELECT `opertype` FROM `my_users` WHERE `user_name` = @a@"
+	query = "SELECT `opertype` FROM `my_users` WHERE `user_name` = @a@"
 }
 
 /*
@@ -471,6 +479,7 @@ sqlite
 {
 	/* The name of this service */
 	name = "sqlite/main"
+
 	/* The database name, it will be created if it does not exist. */
 	database = "anope.db"
 }
@@ -500,9 +509,7 @@ module { name = "m_regex_pcre" }
 /*
  * m_rewrite
  *
- * Provides the command rewrite.
- *
- * Allows rewriting commands sent to clients.
+ * Allows rewriting commands sent to/from clients.
  */
 module { name = "m_rewrite" }
 #command
@@ -532,7 +539,7 @@ module { name = "m_rewrite" }
 /*
  * m_ssl
  *
- * This module uses SSL to connect to the uplink server(s)
+ * This module uses SSL to connect to the uplink server(s).
  */
 #module { name = "m_ssl" }
 ssl
@@ -549,7 +556,7 @@ ssl
 	key = "data/anope.key"
 }
 
-/* 
+/*
  * m_xmlrpc
  *
  * Allows remote applications (websites) to execute queries in real time to retrieve data from Anope.
@@ -590,9 +597,7 @@ webcpanel
 
 	/* Page title */
 	title = "Anope IRC Services";
-	
+
 	/* Whether or not to use https on redirecting URLS */
 	ssl = no
 }
-
-