Merge branch 'insp20' into master.

1 files changed, 41 insertions, 20 deletions

diff --git a/README.md b/README.md
index 6e6110696..8c491cda9 100644
--- a/README.md
+++ b/README.md
@@ -1,28 +1,49 @@
-### Important Notice
+## About
 
-The `master` branch contains the latest development version. If you are running
-a server then you probably want the `insp20` branch. You can obtain this from
-the [releases](https://github.com/inspircd/inspircd/releases) page or by running
-`git checkout insp20` if you are installing via Git.
+InspIRCd is a modular C++ Internet Relay Chat (IRC) server for UNIX-like and Windows systems.
 
-### About
+## Supported Platforms
 
-InspIRCd is a modular Internet Relay Chat (IRC) server written in C++ for Linux,
-BSD, Windows and Mac OS X systems which was created from scratch to be stable,
-modern and lightweight.
+InspIRCd is supported on on the following platforms:
 
-As InspIRCd is one of the few IRC servers written from scratch, it avoids a
-number of design flaws and performance issues that plague other more established
-projects, such as UnrealIRCd, while providing the same level of feature parity.
+- Most recent BSD variants using the Clang or GCC compilers and the GNU toolchains (Make, etc).
 
-InspIRCd is one of only a few IRC servers to provide a tunable number of
-features through the use of an advanced but well documented module system. By
-keeping core functionality to a minimum we hope to increase the stability,
-security and speed of InspIRCd while also making it customisable to the needs of
-many different users.
+- Most recent Linux distributions using the Clang or GCC compilers and the GNU toolchain.
 
-### Links
+- The most recent three major releases of macOS using the AppleClang, Clang, or GCC (*not* LLVM-GCC) compilers and the GNU toolchains.
 
-* [Website](http://inspircd.org)
+- Windows 7 or newer using the MSVC 14 (Visual Studio 2015) compiler and CMake 2.8 or newer.
+
+Alternate platforms and toolchains may also work but are not officially supported by the InspIRCd team. Generally speaking if you are using a reasonably modern UNIX-like system you should be able to build InspIRCd on it.
+
+If you encounter any bugs then [please file an issue](https://github.com/inspircd/inspircd/issues/new).
+
+## Installation
+
+**The `master` branch contains the latest development version. If you are running a server then you probably want the `insp20` branch. You can obtain this from [the releases page](https://github.com/inspircd/inspircd/releases) or by running `git checkout insp20` if you are installing via Git.**
+
+Most InspIRCd users running a UNIX-like system build from source. A guide about how to do this is available on [the InspIRCd wiki](https://wiki.inspircd.org/Installation_From_Source).
+
+Building from source on Windows is generally not recommended but [a guide is available](https://github.com/inspircd/inspircd/blob/master/win/README.txt) if you wish to do this.
+
+<!--
+TODO: uncomment this once we have binary packages for v3.
+
+If you are running on CentOS 7, Debian 7, or Windows binary packages are available from [the downloads page](https://github.com/inspircd/inspircd/releases/latest).
+
+A [Docker](https://www.docker.com) image is also available. See [the inspircd-docker repository](https://github.com/inspircd/inspircd-docker) for more information.
+-->
+
+Some distributions ship an InspIRCd package in their package managers. We generally do not recommend the use of such packages as in the past distributions have made broken modifications to InspIRCd and not kept their packages up to date with essential security updates.
+
+## License
+
+InspIRCd is licensed under [version 2 of the GNU General Public License](https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html).
+
+## External Links
+
+* [Website](https://www.inspircd.org)
+* [Documentation](https://wiki.inspircd.org)
 * [GitHub](https://github.com/inspircd)
-* IRC: \#inspircd on irc.inspircd.org
+* [Support IRC channel](https://kiwiirc.com/nextclient/irc.inspircd.org:+6697/#inspircd) &mdash; \#inspircd on irc.inspircd.org
+* [Development IRC channel](https://kiwiirc.com/nextclient/irc.inspircd.org:+6697/#inspircd.dev) &mdash; \#inspircd.dev on irc.inspircd.org