Merge remote branch 'origin/1.9.3' into 1.9

5 files changed, 129 insertions, 18 deletions

diff --git a/docs/Changes b/docs/Changes
index 0e9cca93d..c296d382a 100644
--- a/docs/Changes
+++ b/docs/Changes
@@ -1,5 +1,13 @@
 Anope Version 1.9.3
 --------------------
+A Tell users when their nicks expire in /ns glist and /ns info
+A Added SSL support
+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
+A Added /chanserv saset command
 
 Anope Version 1.9.2
 --------------------
diff --git a/docs/Changes.conf b/docs/Changes.conf
index 5420f66fd..e4ee68fd0 100644
--- a/docs/Changes.conf
+++ b/docs/Changes.conf
@@ -1,6 +1,22 @@
 Anope Version 1.9.3
--------------------
+------------------
+** ADDED    CONFIGURATION DIRECTIVES **
+nickserv/auspex privilege added
+SSL module added for SSL support
+opertype:inherits added to allow opertypes to inherit commands and privs from other opertypes
+Various nickserv/saset/* and chanserv/saset/* opertype command privileges added
+nickserv:modules added many new ns_set_command modules
+chanserv:modules added many new cs_set_command modules
+opertype:commands added nickserv/saset/* and chanserv/saset/*
 
+** 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 **
 
 Anope Version 1.9.2
 --------------------
diff --git a/docs/Changes.lang b/docs/Changes.lang
index ea711a609..1f75bae03 100644
--- a/docs/Changes.lang
+++ b/docs/Changes.lang
@@ -1,6 +1,105 @@
 Anope Version 1.9.3
--------------------
+--------------------
+*** New Strings:
+    NICK_GLIST_REPLY_NOEXPIRE
+    NICK_SERVADMIN_HELP_INFO
+    NICK_UNGROUP_ONE_NICK
+    NICK_UNGROUP_NOT_IN_GROUP
+    NICK_UNGROUP_SUCCESSFUL
+    NICK_UNGROUP_SUCCESSFUL
+    NICK_HELP_CMD_UNGROUP
+    NICK_REG_MAIL
+    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
+    CHAN_SASET_SYNTAX
+    CHAN_SASET_KEEPTOPIC_SYNTAX
+    CHAN_SASET_OPNOTICE_SYNTAX
+    CHAN_SASET_PEACE
+    CHAN_SASET_PERSIST
+    CHAN_SASET_PRIVATE
+    CHAN_SASET_RESTIRCTED
+    CHAN_SASET_SECURE
+    CHAN_SASET_SECUREFOUNDER
+    CHAN_SASET_SECUREOPS
+    CHAN_SASET_SIGNKICK
+    CHAN_SASET_TOPICLOCK
+    CHAN_SASET_XOP
+    CHAN_HELP_CMD_SASET
+    CHAN_HELP_CMD_SASET_HEAD
+
+*** Mod Strings:
+    NICK_GLIST_REPLY
+    NICK_RESETPASS_MESSAGE
 
+*** Del Strings:
+    NICK_GLIST_REPLY_ADMIN
+    NICK_REG_MAIL_HEAD
+    NICK_REG_MAIL_LINE_1
+    NICK_REG_MAIL_LINE_2
+    NICK_REG_MAIL_LINE_3
+    NICK_REG_MAIL_LINE_4
+    NICK_REG_MAIL_LINE_5
+    MEMO_MAIL_TEXT1
+    MEMO_MAIL_TEXT2
+    MEMO_MAIL_TEXT3
+    NICK_SENDPASS_HEAD
+    NICK_SENDPASS_HEAD_1
+    NICK_SENDPASS_HEAD_2
+    NICK_SENDPASS_HEAD_3
+    NICK_SENDPASS_HEAD_4
+    NICK_SENDPASS_HEAD_5
+    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
+    CHAN_SERVADMIN_HELP_SET
 
 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

diff --git a/docs/WIN32.txt b/docs/WIN32.txt
index c9035dfd0..102c36702 100644
--- a/docs/WIN32.txt
+++ b/docs/WIN32.txt
@@ -25,28 +25,20 @@ Anope for Windows
 

         (NOTE: When installing, tell CMake to add itself to the PATH.)

 

-        If you have Visual C++ 6, 7 (.NET 2002/2003), 8 (2005), or 9 (2008) skip ahead to step 2, else you

+        If you have Visual C++ 10 (2010) skip ahead to step 2, else you

         need to download the following free components from Microsoft. Once

         downloaded, install these packages.

 

-        * Microsoft Visual C++ 2008 Express Edition:

+        * Microsoft Visual C++ 2010 Express Edition:

             http://www.microsoft.com/express/vc/

 

         or

 

-        * Microsoft Visual C++ 2005 Express Edition:

-            http://www.microsoft.com/downloads/details.aspx?FamilyId=7B0B0339-613A-46E6-AB4D-080D4D4A8C4E&displaylang=en

-

         then download and install:

 

         * Microsoft Windows 2008 SDK:

             http://www.microsoft.com/downloads/details.aspx?FamilyId=E6E1C3DF-A74F-4207-8586-711EBE331CDC&displaylang=en

 

-        or (if you prefer a smaller download)

-

-        * Microsoft Windows 2003 Platform SDK: (Requires WGA validation)

-            http://www.microsoft.com/downloads/details.aspx?FamilyId=0BAF2B35-C656-4969-ACE8-E4C0C0716ADB&displaylang=en

-

         (NOTE: Although they say for Windows Server 2003 or 2008, they do infact work on all supported

         versions of Windows. When installing the 2003 SDK, you should select the Custom option, and only select

         to have the Microsoft Windows Core SDK installed. When installing the 2008 SDK, you should select the

@@ -54,10 +46,6 @@ Anope for Windows
         the Visual C++ Compilers as well as the Mobile Tools. Doing this will decrease the install time as well

         as the space used by the SDK.)

 

-        If you chose to download the 2003 SDK, it will not work out-of-the-box on either Visual C++ 2005 Express or

-        Visual C++ 2008 Express. The 2008 SDK will work out-of-the-box with Visual C++ 2008 Express but not with

-        Visual C++ 2005 Express.

-

     2) Unpack the Anope tarball with your favorite uncompression program

        (WinZip or WinRAR, etc).