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

diff --git a/data/example.conf b/data/example.conf
index 872d5a897..ae6ead694 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -1,6 +1,6 @@
 /*
  * Example configuration file for Services. After making the appropriate
- * changes to this file, place it in the Services data directory (as
+ * changes to this file, place it in the Services conf directory (as
  * specified in the "configure" script, default /home/username/services/conf)
  * under the name "services.conf".
  *
@@ -340,8 +340,8 @@ options
 	 * entity (nickname name) with which it is associated. When set, however,
 	 * Services will also check that the password is at least five
 	 * characters long, and in the future will probably check other things
-	 * as well. 
-	 * 
+	 * as well.
+	 *
 	 * This directive is optional, but recommended.
 	 */
 	strictpasswords = yes
@@ -353,7 +353,7 @@ options
 	 * during a single IRC session (subject to badpasstimeout, below), Services
 	 * will issues a /KILL for the user. If not given, Services will ignore
 	 * failed password attempts (though they will be logged in any case).
-	 * 
+	 *
 	 * This directive is optional, but recommended.
 	 */
 	badpasslimit = 5
@@ -488,7 +488,7 @@ options
 
 	/*
 	 * The number of LOGON/OPER news items to display when a user logs on.
-	 * 
+	 *
 	 * This directive is optional, if no set it will default to 3.
 	 */
 	#newscount = 3
@@ -627,7 +627,7 @@ include
 }
 
 /*
- * [RECOMMENDED] Logging Configuration 
+ * [RECOMMENDED] Logging Configuration
  *
  * This section is used for configuring what is logged and where it is logged to.
  * You may have multiple log blocks if you wish. Remember to properly secure any
@@ -644,7 +644,7 @@ log
 	target = "services.log"
 
 	/* Log to both services.log and the channel #services
-	 * 
+	 *
 	 * Note that some older IRCds, such as Ratbox, require services to be in the
 	 * log channel to be able to message it. To do this, configure service:channels to
 	 * join your logging channel.
@@ -716,7 +716,7 @@ log
 log
 {
 	target = "globops"
-	admin = "global/* operserv/mode operserv/kick operserv/akill operserv/s*line operserv/noop operserv/jupe operserv/oline operserv/set operserv/svsnick operserv/svsjoin operserv/svspart nickserv/getpass */drop"
+	admin = "global/* operserv/global operserv/mode operserv/kick operserv/akill operserv/s*line operserv/noop operserv/jupe operserv/oline operserv/set operserv/svsnick operserv/svsjoin operserv/svspart nickserv/getpass */drop"
 	servers = "squit"
 	users = "oper"
 	other = "expire/* bados akill/*"
@@ -762,25 +762,25 @@ log
  *   chanserv/saset/peace     chanserv/saset/persist        chanserv/saset/private
  *   chanserv/saset/secure    chanserv/saset/securefounder  chanserv/saset/secureops
  *   chanserv/saset/signkick  chanserv/saset/successor      chanserv/saset/topiclock
- *   chanserv/saset/url       chanserv/saset/noexpire
+ *   chanserv/saset/url       chanserv/saset/noexpire       chanserv/saset/autoop
  *
  *   memoserv/sendall        memoserv/staff
  *
  *   nickserv/getpass        nickserv/getemail      nickserv/suspend
  *   nickserv/resetpass      nickserv/release       nickserv/list
  *
- *   nickserv/saset/autoop   nickserv/saset/email   nickserv/saset/greet
- *   nickserv/saset/icq      nickserv/saset/kill    nickserv/saset/language nickserv/saset/message
- *   nickserv/saset/private  nickserv/saset/secure  nickserv/saset/url      nickserv/saset/noexpire
+ *   nickserv/saset/autoop   nickserv/saset/email   nickserv/saset/greet     nickserv/saset/password
+ *   nickserv/saset/display  nickserv/saset/kill    nickserv/saset/language  nickserv/saset/message
+ *   nickserv/saset/private  nickserv/saset/secure  nickserv/saset/url       nickserv/saset/noexpire
  *
- *   hostserv/set            hostserv/del
+ *   hostserv/set            hostserv/del           hostserv/list
  *
  *   global/global
  *
- *   operserv/news         operserv/stats        operserv/kick       operserv/exception
- *   operserv/mode         operserv/session      operserv/modlist    operserv/ignore
+ *   operserv/news         operserv/stats        operserv/kick       operserv/exception    operserv/seen
+ *   operserv/mode         operserv/session      operserv/modinfo    operserv/ignore
  *   operserv/chankill     operserv/akill        operserv/sqline     operserv/snline
- *   operserv/szline       operserv/oper         operserv/config     operserv/umode
+ *   operserv/global       operserv/oper         operserv/config     operserv/umode
  *   operserv/modload      operserv/jupe         operserv/set        operserv/noop
  *   operserv/quit         operserv/update       operserv/reload     operserv/restart
  *   operserv/shutdown     operserv/svs          operserv/oline      operserv/kill
@@ -812,7 +812,7 @@ opertype
 	inherits = "Helper, Another Helper"
 
 	/* What commands (see above) this opertype may use */
-	commands = "chanserv/list chanserv/suspend chanserv/topic memoserv/staff nickserv/list nickserv/resetpass nickserv/suspend operserv/mode operserv/chankill operserv/szline operserv/akill operserv/session operserv/modlist operserv/sqline operserv/oper operserv/kick operserv/ignore operserv/snline"
+	commands = "chanserv/list chanserv/suspend chanserv/topic memoserv/staff nickserv/list nickserv/resetpass nickserv/suspend operserv/mode operserv/chankill operserv/akill operserv/session operserv/modinfo operserv/sqline operserv/oper operserv/kick operserv/ignore operserv/snline"
 
 	/* What privs (see above) this opertype has */
 	privs = "chanserv/auspex chanserv/no-register-limit memoserv/* nickserv/auspex nickserv/confirm"
@@ -871,17 +871,17 @@ oper
 	 */
 	require_oper = yes
 
-	/* An optional password. If defined the user must login using /operserv login first */
+	/* An optional password. If defined the user must login using "/msg OperServ LOGIN" first */
 	#password = "secret"
 
-	/* An optional SSL fingerprint. If defined is required to use this opertype. */
+	/* An optional SSL fingerprint. If defined, it's required to be able to use this opertype. */
 	#certfp = "ed3383b3f7d74e89433ddaa4a6e5b2d7"
 
 	/* An optional list of user@host masks. If defined the user must be connected from one of them */
 	#host = "*@*.anope.org ident@*"
 
-	/* An optional vhost to set on users who identify for this oper block.
-	 * This will override HostServ vhosts, and may not be available on all IRCds
+	/* An optional vHost to set on users who identify for this oper block.
+	 * This will override HostServ vHosts, and may not be available on all IRCds
 	 */
 	#vhost = "oper.mynet"
 }
@@ -941,7 +941,8 @@ mail
 	sendfrom = "services@localhost.net"
 
 	/*
-	 * If set, SENDPASS and RESETPASS will be restricted to IRC operators.
+	 * If set, RESETPASS will be restricted to services operators with access to
+	 * nickserv/resetpass in their opertype:commands.
 	 * This directive is optional.
 	 *
 	 * WARNING: If you choose to not enable this option, you should limit the
@@ -975,13 +976,14 @@ mail
 	/*
 	 * The subject and message of emails sent to users when they register accounts.
 	 */
-	registration_subject = "Nickname Registration for %n"
+	registration_subject = "Nickname registration for %n"
 	registration_message = "Hi,
 
 				You have requested to register the nickname %n on %N.
-				Please type \" /msg NickServ confirm %c \" to complete registration.
+				Please type \" /msg NickServ CONFIRM %c \" to complete registration.
 
 				If you don't know why this mail was sent to you, please ignore it silently.
+
 				%N administrators."
 
 	/*
@@ -1004,22 +1006,23 @@ mail
 	emailchange_message = "Hi,
 
 			You have requested to change your email address to %e.
-			Please type \" /msg NickServ confirm %c \" to confirm this change.
+			Please type \" /msg NickServ CONFIRM %c \" to confirm this change.
 
 			If you don't know why this mail was sent to you, please ignore it silently.
 
 			%N administrators."
 
 	/*
-	 * The subject and message of emails sent to users when they recieve a new memo.
+	 * The subject and message of emails sent to users when they receive a new memo.
 	 */
 	memo_subject = "New memo"
-	memo_message = "Hi %n
-		You've just received a new memo from %s. This is memo number %d.
+	memo_message = "Hi %n,
 
-		Memo text:
+			You've just received a new memo from %s. This is memo number %d.
 
-		%t"
+			Memo text:
+
+			%t"
 }
 
 /*
@@ -1080,9 +1083,9 @@ db_flatfile
 
 	/*
 	 * If enabled, services will fork a child process to save databases.
-	 * 
+	 *
 	 * This is only useful with very large databases, with hundreds
-	 * of thousands of objects, that have a noticable delay from
+	 * of thousands of objects, that have a noticeable delay from
 	 * writing databases.
 	 */
 	fork = no
@@ -1131,15 +1134,15 @@ db_sql
  * The encryption modules are used when dealing with passwords. This determines how
  * the passwords are stored in the databases, and does not add any security as
  * far as transmitting passwords over the network goes.
- * 
+ *
  * Without any encryption modules loaded users will not be able to authenticate unless
  * there is another module loaded that provides authentication checking, such as
  * m_ldap_authentication or m_sql_authentication.
  *
- * With enc_none, passwords will be stored in plain text, allowing
- * for passwords to be recovered later but isn't secure therefore is not recommended. 
- * 
- * The other encryption modules use one-way encryption, so the passwords can not 
+ * With enc_none, passwords will be stored in plain text, allowing for passwords
+ * to be recovered later but it isn't secure and therefore is not recommended.
+ *
+ * The other encryption modules use one-way encryption, so the passwords can not
  * be recovered later if those are used.
  *
  * The first encryption module loaded is the primary encryption module. All new passwords are
@@ -1164,7 +1167,7 @@ module { name = "enc_sha256" }
 
 /*
  * When using enc_none, passwords will be stored without encryption. This isn't secure
- * therefore it is not recommended. 
+ * therefore it is not recommended.
  */
 #module { name = "enc_none" }