Merge branch '2.0' into 2.1

1 files changed, 10 insertions, 2 deletions

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" }