Merge branch '2.0' into 2.1

6 files changed, 44 insertions, 16 deletions

diff --git a/data/chanserv.example.conf b/data/chanserv.example.conf
index aa336f1e4..86ca969fc 100644
--- a/data/chanserv.example.conf
+++ b/data/chanserv.example.conf
@@ -143,6 +143,13 @@ module
 	reasonmax = 200
 
 	/*
+	 * The message formatting to use for signed kick messages.
+	 * %n is the nick of the kicker
+	 * %m is the message specified
+	 */
+	signkickformat = "%m (%n)"
+
+	/*
 	 * If set, prevents channel access entries from containing hostmasks.
 	 */
 	disallow_hostmask_access = false
@@ -1159,7 +1166,7 @@ command { service = "ChanServ"; name = "SET"; command = "chanserv/set"; group =
 command { service = "ChanServ"; name = "SET AUTOOP"; command = "chanserv/set/autoop"; }
 command { service = "ChanServ"; name = "SET BANTYPE"; command = "chanserv/set/bantype"; }
 command { service = "ChanServ"; name = "SET DESCRIPTION"; command = "chanserv/set/description"; }
-command { service = "ChanServ"; name = "SET DESC"; command = "chanserv/set/description"; }
+command { service = "ChanServ"; name = "SET DESC"; command = "chanserv/set/description"; hide = yes; }
 command { service = "ChanServ"; name = "SET FOUNDER"; command = "chanserv/set/founder"; }
 command { service = "ChanServ"; name = "SET KEEPMODES"; command = "chanserv/set/keepmodes"; }
 command { service = "ChanServ"; name = "SET PEACE"; command = "chanserv/set/peace"; }
diff --git a/data/example.conf b/data/example.conf
index ccaaf799b..02f7f9016 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -304,6 +304,16 @@ networkinfo
 	modelistsize = 100
 
 	/*
+	 * Characters allowed in nicknames. This always includes the characters described
+	 * in RFC1459, and so does not need to be set for normal behavior. Changing this to
+	 * include characters your IRCd doesn't support will cause your IRCd and/or Services
+	 * to break. Multibyte characters are not supported, nor are escape sequences.
+	 *
+	 * It is recommended you DON'T change this.
+	 */
+	#nick_chars = ""
+
+	/*
 	 * The characters allowed in hostnames. This is used for validating hostnames given
 	 * to services, such as BotServ bot hostnames and user vhosts. Changing this is not
 	 * recommended unless you know for sure your IRCd supports whatever characters you are
@@ -693,7 +703,7 @@ log
 	 *    create, destroy, join, part, kick, leave, mode
 	 *
 	 * Valid user options are:
-	 *    connect, disconnect, quit, nick, ident, host, mode, maxusers, oper
+	 *    connect, disconnect, quit, nick, ident, host, mode, maxusers, oper, away
 	 *
 	 * Rawio and debug are simple yes/no answers, there are no types for them.
 	 *
@@ -815,7 +825,7 @@ opertype
 	/* The name of this opertype */
 	name = "Services Operator"
 
-	/* What opertype(s) this inherits from. Seperate with a comma. */
+	/* What opertype(s) this inherits from. Separate with a comma. */
 	inherits = "Helper, Another Helper"
 
 	/* What commands (see above) this opertype may use */
@@ -841,7 +851,7 @@ opertype
 
 	inherits = "Services Operator"
 
-	commands = "chanserv/access/list chanserv/drop chanserv/getkey chanserv/saset/noexpire memoserv/sendall nickserv/saset/* nickserv/getemail operserv/news operserv/jupe operserv/svs operserv/stats operserv/oline operserv/noop operserv/forbid global/*"
+	commands = "botserv/* chanserv/access/list chanserv/drop chanserv/getkey chanserv/saset/noexpire memoserv/sendall nickserv/saset/* nickserv/getemail operserv/news operserv/jupe operserv/svs operserv/stats operserv/oline operserv/noop operserv/forbid global/*"
 
 	privs = "*"
 }
@@ -998,7 +1008,7 @@ mail
 	emailchange_subject = "Email confirmation"
 	emailchange_message = "Hi,
 
-			You have requested to change your email address to %e.
+			You have requested to change your email address from %e to %E.
 			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.
diff --git a/data/hybrid.example.conf b/data/hybrid.example.conf
index ce285b30c..2af525c28 100644
--- a/data/hybrid.example.conf
+++ b/data/hybrid.example.conf
@@ -59,13 +59,6 @@ usermode
 
 usermode
 {
-	name = "OPERWALL"
-	character = "z"
-	oper_only = yes
-}
-
-usermode
-{
 	name = "DEAF"
 	character = "D"
 }
diff --git a/data/modules.example.conf b/data/modules.example.conf
index 4d3894bef..c5d8fb3a4 100644
--- a/data/modules.example.conf
+++ b/data/modules.example.conf
@@ -243,7 +243,6 @@ module { name = "help" }
 	ldap
 	{
 		server = "ldap://127.0.0.1"
-		port = 389
 
 		/*
 		 * Admin credentials used for performing searches and adding users.
@@ -299,7 +298,9 @@ module { name = "help" }
 	password_attribute = "userPassword"
 
 	/*
-	 * If set, the reason to give the users who try to "/msg NickServ REGISTER".
+	 * If set, the reason to give the users who try to register with nickserv,
+	 * including nick registration from grouping.
+	 *
 	 * If not set, then registration is not blocked.
 	 */
 	#disable_register_reason = "To register on this network visit http://some.misconfigured.site/register"
@@ -598,6 +599,14 @@ module { name = "help" }
 	 */
 	cert = "data/anope.crt"
 	key = "data/anope.key"
+
+	/*
+	 * As of 2014 SSL 3.0 is considered insecure, but it might be enabled
+	 * on some systems by default for compatibility reasons.
+	 * You can use the following option to enable or disable it explicitly.
+	 * Leaving this option not set defaults to the default system behavior.
+	 */
+	#sslv3 = no
 }
 
 /*
diff --git a/data/nickserv.example.conf b/data/nickserv.example.conf
index f23361eee..f8ffade33 100644
--- a/data/nickserv.example.conf
+++ b/data/nickserv.example.conf
@@ -372,7 +372,15 @@ command { service = "NickServ"; name = "UNGROUP"; command = "nickserv/ungroup";
  *
  * Used for identifying to accounts.
  */
-module { name = "ns_identify" }
+module
+{
+	name = "ns_identify"
+
+	/*
+	 * If set, limits the number of concurrent users that can be logged in as a given account at once.
+	 */
+	maxlogins = 10
+}
 command { service = "NickServ"; name = "ID"; command = "nickserv/identify"; hide = true; }
 command { service = "NickServ"; name = "IDENTIFY"; command = "nickserv/identify"; }
 
@@ -381,7 +389,7 @@ command { service = "NickServ"; name = "IDENTIFY"; command = "nickserv/identify"
  *
  * Provides the commands:
  * nickserv/info. - Used for gathering information about an account.
- * nickserv/set/hide, nickserv/saset/hide - Used for configuring which options are publically shown in nickserv/info.
+ * nickserv/set/hide, nickserv/saset/hide - Used for configuring which options are publicly shown in nickserv/info.
  *
  */
 module { name = "ns_info" }
diff --git a/data/unreal.example.conf b/data/unreal.example.conf
index 35a4210e6..d46f118c2 100644
--- a/data/unreal.example.conf
+++ b/data/unreal.example.conf
@@ -48,6 +48,7 @@ usermode
 {
 	name = "HIDEIDLE"
 	character = "I"
+	oper_only = yes
 }
 
 usermode