Backport various minor config changes from 2.1.

data/modules.example.conf

@@ -233,7 +233,7 @@ module { name = "help" }
 }
 
 /*
- * m_ldap [EXTRA]
+ * [EXTRA] m_ldap
  *
  * This module allows other modules to use LDAP. By itself, this module does nothing useful.
  */
@@ -254,7 +254,7 @@ module { name = "help" }
 }
 
 /*
- * m_ldap_authentication [EXTRA]
+ * [EXTRA] m_ldap_authentication
  *
  * This module allows many commands such as IDENTIFY, RELEASE, RECOVER, GHOST, etc. use
  * LDAP to authenticate users. Requires m_ldap.
@@ -314,7 +314,7 @@ module { name = "help" }
 }
 
 /*
- * m_ldap_oper [EXTRA]
+ * [EXTRA] m_ldap_oper
  *
  * This module dynamically ties users to Anope opertypes when they identify
  * via LDAP group membership. Requires m_ldap.
@@ -355,7 +355,7 @@ module { name = "help" }
 }
 
 /*
- * m_mysql [EXTRA]
+ * [EXTRA] m_mysql
  *
  * This module allows other modules to use MySQL.
  */
@@ -401,7 +401,7 @@ module { name = "help" }
 }
 
 /*
- * m_regex_pcre [EXTRA]
+ * [DEPRECATED] [EXTRA] m_regex_pcre
  *
  * Provides the regex engine regex/pcre, which uses version 1 of the Perl Compatible Regular
  * Expressions library. This can not be loaded at the same time as the m_regex_pcre2 module.
@@ -409,7 +409,7 @@ module { name = "help" }
 #module { name = "m_regex_pcre" }
 
 /*
- * m_regex_pcre2 [EXTRA]
+ * [EXTRA] m_regex_pcre2
  *
  * Provides the regex engine regex/pcre, which uses version 2 of the Perl Compatible Regular
  * Expressions library. This can not be loaded at the same time as the m_regex_pcre module.
@@ -417,7 +417,7 @@ module { name = "help" }
 #module { name = "m_regex_pcre2" }
 
 /*
- * m_regex_posix [EXTRA]
+ * [EXTRA] m_regex_posix
  *
  * Provides the regex engine regex/posix, which uses the POSIX compliant regular expressions.
  * This is likely the only regex module you will not need extra libraries for.
@@ -425,7 +425,7 @@ module { name = "help" }
 #module { name = "m_regex_posix" }
 
 /*
- * m_regex_tre [EXTRA]
+ * [EXTRA] m_regex_tre
  *
  * Provides the regex engine regex/tre, which uses the TRE regex library.
  */
@@ -442,7 +442,7 @@ module { name = "help" }
 	service = "ChanServ"; name = "CLEAR"; command = "rewrite"
 
 	/* Enable m_rewrite. */
-	rewrite = true
+	rewrite = yes
 
 	/* Source message to match. A $ can be used to match anything. */
 	rewrite_source = "CLEAR $ USERS"
@@ -546,15 +546,26 @@ module { name = "help" }
 /*
  * m_sasl
  *
- * Some IRCds allow "SASL" authentication to let users identify to Services
- * during the IRCd user registration process. If this module is loaded, Services will allow
- * authenticating users through this mechanism. Supported mechanisms are:
- * PLAIN, EXTERNAL.
+ * Provides support for authentication to services via IRCv3 SASL. This is a standardised
+ * alternative to ns_identify that is supported by several IRCds.
+ *
+ * You will need to configure your IRCd to use SASL. See the following links for details:
+ *
+ * InspIRCd: https://docs.inspircd.org/4/modules/sasl/
+ * UnrealIRCd: https://www.unrealircd.org/docs/SASL#Enabling_SASL_on_the_server
  */
-module { name = "m_sasl" }
+module
+{
+	name = "m_sasl"
+
+	/*
+	 * The nick of the client which operates as the SASL agent.
+	 */
+	#agent = "NickServ"
+}
 
 /*
- * m_ssl_gnutls [EXTRA]
+ * [EXTRA] m_ssl_gnutls
  *
  * This module provides SSL services to Anope using GnuTLS, for example to
  * connect to the uplink server(s) via SSL.
@@ -592,7 +603,7 @@ module { name = "m_sasl" }
 }
 
 /*
- * m_ssl_openssl [EXTRA]
+ * [EXTRA] m_ssl_openssl
  *
  * This module provides SSL services to Anope using OpenSSL, for example to
  * connect to the uplink server(s) via SSL.
@@ -625,7 +636,7 @@ module { name = "m_sasl" }
 }
 
 /*
- * m_sql_authentication [EXTRA]
+ * [EXTRA] m_sql_authentication
  *
  * This module allows authenticating users against an external SQL database using a custom
  * query.
@@ -676,7 +687,7 @@ module { name = "m_sasl" }
 }
 
 /*
- * m_sql_log [EXTRA]
+ * [EXTRA] m_sql_log
  *
  * This module adds an additional target option to log{} blocks
  * that allows logging Service's logs to SQL. To log to SQL, add
@@ -696,7 +707,7 @@ module { name = "m_sasl" }
 #module { name = "m_sql_log" }
 
 /*
- * m_sql_oper [EXTRA]
+ * [EXTRA] m_sql_oper
  *
  * This module allows granting users services operator privileges and possibly IRC Operator
  * privileges based on an external SQL database using a custom query.
@@ -722,7 +733,7 @@ module { name = "m_sasl" }
 }
 
 /*
- * m_sqlite [EXTRA]
+ * [EXTRA] m_sqlite
  *
  * This module allows other modules to use SQLite.
  */
@@ -737,7 +748,7 @@ module { name = "m_sasl" }
 		name = "sqlite/main"
 
 		/* The database name, it will be created if it does not exist. */
-		database = "anope.db"
+		database = "anope.sqlite"
 	}
 }
 
@@ -755,13 +766,13 @@ module { name = "m_sasl" }
 	name = "webcpanel"
 
 	/* Web server to use. */
-	server = "httpd/main";
+	server = "httpd/main"
 
 	/* Template to use. */
-	template = "default";
+	template = "default"
 
 	/* Page title. */
-	title = "Anope IRC Services";
+	title = "Anope IRC Services"
 }
 
 /*