Burned slist, rewrote operservs XLine code

4 files changed, 61 insertions, 2 deletions

diff --git a/docs/Changes b/docs/Changes
index d88eae010..7786757fa 100644
--- a/docs/Changes
+++ b/docs/Changes
@@ -6,6 +6,7 @@ A Added official support for InspIRCd 2.0
 A Prevent negaitve mode changes, kicks, bans, and autokicks from affecting people with the 'god' user mode (On UnrealIRCd, usermode +q)
 A Added nickserv/auxpex permission
 A Added nickserv ungroup command
+A Renamed the SGLINE to be SNLINE
 
 Anope Version 1.9.2
 --------------------
diff --git a/docs/Changes.conf b/docs/Changes.conf
index 944238db6..03d012a14 100644
--- a/docs/Changes.conf
+++ b/docs/Changes.conf
@@ -6,6 +6,11 @@ SSL module added for SSL support
 opertype:inherits added to allow opertypes to inherit commands and privs from other opertypes
 
 ** MODIFIED CONFIGURATION DIRECTIVES **
+opertype:commands changed operserv/sgline to opserv/snline
+operserv:modules changed os_sgline to os_snline
+operserv:sglineexpiry changed to operserv:snlineexpiry
+operserv:killonsgline changed to operserv:killonsnline
+operserv:notifications ossgline changed ossnline
 
 ** DELETED  CONFIGURATION DIRECTIVES **
 
diff --git a/docs/Changes.lang b/docs/Changes.lang
index 4289ba295..701d4fff4 100644
--- a/docs/Changes.lang
+++ b/docs/Changes.lang
@@ -12,6 +12,31 @@ Anope Version 1.9.3
     NICK_MAIL_TEXT
     NICK_SENDPASS
     CHAN_LEVEL_FOUNDER
+    OPER_STATS_SNLINE_COUNT
+    OPER_STATS_SNLINE_EXPIRE_DAY
+    OPER_STATS_SNLINE_EXPIRE_HOURS
+    OPER_STATS_SNLINE_EXPIRE_MINS
+    OPER_STATS_SNLINE_EXPIRE_MIN
+    OPER_STATS_SNLINE_EXPIRE_NONE
+    OPER_SNLINE_SYNTAX
+    OPER_SNLINE_UNSUPPORTED
+    OPER_SNLINE_EXISTS
+    OPER_SNLINE_ALREADY_COVERED
+    OPER_SNLINE_REACHED_LIMIT
+    OPER_SNLINE_ADDED
+    OPER_SNLINE_CHANGED
+    OPER_SNLINE_NOT_FOUND
+    OPER_SNLINE_NO_MATCH
+    OPER_SNLINE_DELETED
+    OPER_SNLINE_DELETED_ONE
+    OPER_SNLINE_DELETED_SEVERAL
+    OPER_SNLINE_LIST_EMPTY
+    OPER_SNLINE_LIST_HEADER
+    OPER_SNLINE_LIST_FORMAT
+    OPER_SNLINE_VIEW_HEADER
+    OPER_SNLINE_CLEAR
+    OPER_HELP_CMD_SNLINE
+    OPER_HELP_SNLINE
 
 *** Mod Strings:
     NICK_GLIST_REPLY
@@ -34,6 +59,34 @@ Anope Version 1.9.3
     NICK_SENDPASS_HEAD_3
     NICK_SENDPASS_HEAD_4
     NICK_SENDPASS_HEAD_5
+<<<<<<< HEAD
+    OPER_STATS_SGLINE_COUNT
+    OPER_STATS_SGLINE_EXPIRE_DAY
+    OPER_STATS_SGLINE_EXPIRE_HOURS
+    OPER_STATS_SGLINE_EXPIRE_MINS
+    OPER_STATS_SGLINE_EXPIRE_MIN
+    OPER_STATS_SGLINE_EXPIRE_NONE
+    OPER_SGLINE_SYNTAX
+    OPER_SGLINE_UNSUPPORTED
+    OPER_SGLINE_EXISTS
+    OPER_SGLINE_ALREADY_COVERED
+    OPER_SGLINE_REACHED_LIMIT
+    OPER_SGLINE_ADDED
+    OPER_SGLINE_CHANGED
+    OPER_SGLINE_NOT_FOUND
+    OPER_SGLINE_NO_MATCH
+    OPER_SGLINE_DELETED
+    OPER_SGLINE_DELETED_ONE
+    OPER_SGLINE_DELETED_SEVERAL
+    OPER_SGLINE_LIST_EMPTY
+    OPER_SGLINE_LIST_HEADER
+    OPER_SGLINE_LIST_FORMAT
+    OPER_SGLINE_VIEW_HEADER
+    OPER_SGLINE_CLEAR
+    OPER_HELP_CMD_SGLINE
+    OPER_HELP_SGLINE
+=======
+>>>>>>> 1.9.3-2
 
 Anope Version 1.9.2
 --------------------
diff --git a/docs/IRCD b/docs/IRCD
index 52ee424bb..ad81c97f1 100644
--- a/docs/IRCD
+++ b/docs/IRCD
@@ -85,7 +85,7 @@ How To Add IRCd Support
     6) VHOST: Can a user's host be changed on the fly? Enabling this allow

                HostServ online. Use 1 for yes, 0 for no.

 

-    7) SGLINE: Does the IRCd support realname (geocs) bans? Use 1 for yes,

+    7) SNLINE: Does the IRCd support realname (geocs) bans? Use 1 for yes,

                 0 for no.

 

     8) SQLINE: Does the IRCd support nick bans? Use 1 for yes, 0 for no.

@@ -172,7 +172,7 @@ How To Add IRCd Support
     35) SVSMODE UCMODE: Can we clear user channel modes with SVSMODE? Use

                         1 for yes, 0 for no.

 

-    36) SGline Enforce: Does the IRCd enforce SGLINES for us or do we need to

+    36) SGline Enforce: Does the IRCd enforce SNLINES for us or do we need to

                         do so? Use 1 for yes, 0 for no.

 

     37) Vhost Character: The character used to represent the vHost mode, if