Merge branch '2.0' into 2.1

Conflicts:
	CMakeLists.txt
	include/modules.h
	include/serialize.h
	modules/commands/bs_assign.cpp
	modules/commands/bs_badwords.cpp
	modules/commands/bs_bot.cpp
	modules/commands/bs_control.cpp
	modules/commands/bs_kick.cpp
	modules/commands/cs_access.cpp
	modules/commands/cs_akick.cpp
	modules/commands/cs_drop.cpp
	modules/commands/cs_entrymsg.cpp
	modules/commands/cs_flags.cpp
	modules/commands/cs_info.cpp
	modules/commands/cs_invite.cpp
	modules/commands/cs_kick.cpp
	modules/commands/cs_mode.cpp
	modules/commands/cs_register.cpp
	modules/commands/cs_seen.cpp
	modules/commands/cs_set.cpp
	modules/commands/cs_suspend.cpp
	modules/commands/cs_topic.cpp
	modules/commands/cs_unban.cpp
	modules/commands/cs_xop.cpp
	modules/commands/hs_del.cpp
	modules/commands/hs_list.cpp
	modules/commands/hs_request.cpp
	modules/commands/ms_ignore.cpp
	modules/commands/ms_send.cpp
	modules/commands/ns_recover.cpp
	modules/commands/ns_register.cpp
	modules/commands/ns_suspend.cpp
	modules/commands/os_dns.cpp
	modules/commands/os_noop.cpp
	modules/commands/os_oper.cpp
	modules/commands/os_session.cpp
	modules/database/db_sql_live.cpp
	modules/encryption/enc_bcrypt.cpp
	modules/extra/m_ldap_authentication.cpp
	modules/extra/m_ldap_oper.cpp
	modules/fantasy.cpp
	modules/m_dnsbl.cpp
	modules/m_sasl.cpp
	modules/protocol/hybrid.cpp
	modules/protocol/inspircd20.cpp
	modules/protocol/unreal.cpp
	modules/pseudoclients/chanserv.cpp
	modules/pseudoclients/nickserv.cpp
	modules/webcpanel/pages/chanserv/access.cpp
	modules/webcpanel/webcpanel.cpp
	modules/webcpanel/webcpanel.h
	src/command.cpp
	src/messages.cpp
	src/modulemanager.cpp
	src/regchannel.cpp
	src/serialize.cpp

1 files changed, 4 insertions, 19 deletions

diff --git a/docs/INSTALL b/docs/INSTALL
index 6d614d0e6..0a923ef97 100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -21,26 +21,19 @@ Note: You should also read the README and FAQ files!
 
         http://www.anope.org/
 
-    Anope can be built one of two ways. The recommended way is to use CMake.
-    You can check if CMake is already installed on your system using the
-    command:
+    Anope requires cmake to build. You can check if CMake is already
+    installed on your system using the command:
 
         cmake --version
 
     If it's installed, you will get a line that says something similar to
-    "cmake version 2.6-patch 1". If the version is less than 2.4 or you get
+    "cmake version 2.8.12.2". If the version is less than 2.4 or you get
     an error saying the command was not found, you will not be able to use
     CMake unless you install it yourself into your home directory. CMake
     can be downloaded from:
 
         http://www.cmake.org/cmake/resources/software.html
 
-    If you are unable to install CMake yourself (either due to lack of space
-    or restrictions by your hosting provider), you still have the alternative
-    to use the provided configure script. This option is not recommended and
-    will eventually be phased out, but is provided for compatibility for those
-    lacking CMake.
-
     Next, unpack the package in your home directory, and go into the created
     directory.
 
@@ -51,16 +44,8 @@ Note: You should also read the README and FAQ files!
     Now type ./Config to start the configuration script. It will ask you a
     few questions, and figure out how to compile Anope on your system. If
     you are unsure about the answer to a question, use the default value.
-    The question to using configure or cmake depends on your decision from
-    above. If you have CMake and wish to use it, answer with cmake, otherwise
-    answer with configure.
-
-    You can now type make to compile Anope. If there are errors in the
-    Makefile, *try to use gmake* instead. If it still doesn't work, you (or
-    the system administrator if it's a shell) must install GNU make. You may
-    find it at ftp://prep.ai.mit.edu/pub/gnu/.
 
-    Now type make install (or gmake install; see above). This will install
+    Now cd build and type make and make install. This will install
     all the needed files in the paths you specified with the configure
     script, and setup file permissions. You should ensure that the data
     directory is not accessible by other users, as malicious users may