Merge branch '2.0' into 2.1

Conflicts:
	cmake/Anope.cmake
	cmake/FindGettext.cmake
	include/access.h
	include/messages.h
	include/modes.h
	include/modules.h
	include/users.h
	modules/CMakeLists.txt
	modules/commands/bs_bot.cpp
	modules/commands/cs_access.cpp
	modules/commands/cs_ban.cpp
	modules/commands/cs_clone.cpp
	modules/commands/cs_flags.cpp
	modules/commands/cs_info.cpp
	modules/commands/cs_list.cpp
	modules/commands/cs_log.cpp
	modules/commands/cs_mode.cpp
	modules/commands/cs_status.cpp
	modules/commands/cs_suspend.cpp
	modules/commands/cs_updown.cpp
	modules/commands/cs_xop.cpp
	modules/commands/ms_check.cpp
	modules/commands/ns_access.cpp
	modules/commands/ns_cert.cpp
	modules/commands/ns_group.cpp
	modules/commands/ns_register.cpp
	modules/commands/ns_set.cpp
	modules/commands/ns_suspend.cpp
	modules/commands/os_session.cpp
	modules/commands/os_svs.cpp
	modules/extra/m_ldap_authentication.cpp
	modules/extra/m_regex_pcre.cpp
	modules/extra/m_sql_authentication.cpp
	modules/extra/stats/m_chanstats.cpp
	modules/protocol/bahamut.cpp
	modules/protocol/hybrid.cpp
	modules/protocol/inspircd12.cpp
	modules/protocol/inspircd20.cpp
	modules/protocol/unreal.cpp
	modules/pseudoclients/chanserv.cpp
	modules/pseudoclients/chanserv/channel.cpp
	modules/pseudoclients/nickserv/nickserv.cpp
	modules/webcpanel/pages/chanserv/access.cpp
	src/access.cpp
	src/bots.cpp
	src/channels.cpp
	src/language.cpp
	src/modes.cpp
	src/modulemanager.cpp
	src/process.cpp
	src/users.cpp
	src/version.sh

3 files changed, 24 insertions, 12 deletions

diff --git a/docs/Changes b/docs/Changes
index 1d01629fb..6280734c3 100644
--- a/docs/Changes
+++ b/docs/Changes
@@ -1,3 +1,17 @@
+Anope Version 2.0.1
+-------------------
+Fix access entries on accounts sometimes not updating when a user's display name changes
+Fix ns_group to properly validate the account of the user against the target
+Fix os_stats not saving max user count and time when using SQL
+Fix nickalias's 'nc' field sometimes not being updated when using SQL
+Fix several crashes on Windows related to being unable to load modules
+Fix bs_bot change not properly reintroducing bots after changing their ident, host, or realname
+
+Add English language file to allow users to easily modify language strings
+Add configuring which mode cs_ban sets, and added a MUTE command to BotServ's fantasy
+Allow SVSPART to take an optional reason
+Allow cs_list to search channel topics and descriptions
+
 Anope Version 2.0.0
 -------------------
 Added irc2sql stats module
diff --git a/docs/Changes.conf b/docs/Changes.conf
index 82e36be6d..de9074f11 100644
--- a/docs/Changes.conf
+++ b/docs/Changes.conf
@@ -1,3 +1,9 @@
+Anope Version 2.0.1
+-------------------
+Add MUTE command to BotServ fantasy configuration
+Document memo_mail option in nickserv.conf
+Add 'show' setting to ns_info and cs_info to control which fields are shown to non opers
+
 Anope Version 2.0.0
 -------------------
 options:passlen, enforceruser, enforcerhost, releasetimeout, and guestnickprefix moved to nickserv's module configuration
diff --git a/docs/WIN32.txt b/docs/WIN32.txt
index 018b898d2..071831995 100644
--- a/docs/WIN32.txt
+++ b/docs/WIN32.txt
@@ -73,18 +73,10 @@ Anope for Windows
        Some Anope modules require third party libraries, such as m_mysql and

        the SSL modules. If these libraries are installed in nonstandard

        locations, cmake will probably not find them and should be told where

-       they are by passing additional search paths to the last question in

-       Config, such as:

-

-       -DEXTRA_INCLUDE:STRING=c:/openssl/include;c:/mysql/include

-       -DEXTRA_LIBS:STRING=c:/openssl/lib;c:/mysql/lib

-

-       Building Anope with gettext requires libintl, libiconv, libgcc and

-       libmingex. We have precompiled these libraries for you that you may

-       use if you want. They are avaiable at http://anope.org/downloads/anope-extra.zip

-       The OpenSSL, MySQL, and OpenLDAP header files and libraries are also included in

-       this package. Once downloaded and extracted, you should run install.bat

-       then give Config the path to the new 'installed' directory.

+       they are by passing their location to Config.

+

+       The libraries used to build the 'extra' modules are available at

+       https://github.com/Adam-/windows-scripts.

 

     5) You are now ready to compile. If you said you wanted to use NMake in step 4,

        at the prompt type: