Merge branch '2.0' into 2.1

cmake/NSIS.template.in

@@ -118,7 +118,7 @@ Var AR_RegFlags
  "exit_${SecName}:"
 !macroend
 
-!macro RemoveSection SecName
+!macro RemoveSection_CPack SecName
   ;  This macro is used to call section's Remove_... macro
   ;from the uninstaller.
   ;Input: section index constant name specified in Section command.
@@ -731,7 +731,7 @@ Section "Uninstall"
   DeleteRegKey SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
 
   ; Removes all optional components
-  !insertmacro SectionList "RemoveSection"
+  !insertmacro SectionList "RemoveSection_CPack"
 
   !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
 

docs/Changes

@@ -1,11 +1,22 @@
-Anope Version 2.0.10-git
+Anope Version 2.0.10
 --------------------
+Add support for channel SQLines on InspIRCd
+Change default protocol module from inspircd20 to inspircd3
+Change the character set used by chanstats and irc2sql to utf8mb4
+Fix a ton of typos in messages
+Fix being able to override MAXLIST on InspIRCd
+Fix blocking on boot when trying to upgrade SQL databases without account identifiers
+Fix not flushing the ERROR message on squit
+Fix using an invalidated iterator when deleting bots
+Fix various harmless compiler warnings
+Fix webcpanel not using the forwarded IP
+Show the account name in nickserv/info
 
 Anope Version 2.0.9
 -------------------
-Fix a regression from 2.0.8 that prevented serialising to MySQL.
+Fix a regression from 2.0.8 that prevented serialising to MySQL
 Send account identifiers to InspIRCd on SASL logins too
-Fix a query bug in irc2sql.
+Fix a query bug in irc2sql
 
 Anope Version 2.0.8
 -------------------

docs/Changes.conf

@@ -4,8 +4,9 @@ Added nickserv:minpasslen for configuring the minimum password length.
 Removed nickserv:strictpasswords as it is obsolete now nickserv:minpasslen exists.
 Renamed nickserv:passlen to nickserv:maxpasslen.
 
-Anope Version 2.0.10-git
+Anope Version 2.0.10
 --------------------
+No significant changes.
 
 Anope Version 2.0.9
 -------------------

docs/README

@@ -92,7 +92,7 @@ Table of Contents
         * Lee Holmes <lethality@anope.org>
         * Lucas Nussbaum <lucas@lucas-nussbaum.net>
         * Mark Summers <mark@goopler.net>
-        * Matthew Beeching <jobe@invictachat.net>
+        * Matthew Beeching <jobe@mdbnet.co.uk>
         * Naram Qashat <cyberbotx@anope.org>
         * Phil Lavin <phil@anope.org>
         * Pieter Bootsma <geniusdex@anope.org>