Fix a crash when the core_oper module is not loaded.

[user/henk/code/inspircd.git] / README.md

diff --git a/README.md b/README.md
index 2e46cea37453b5417182289ea72ae20f2f69e336..be5d1ceadc884b478c8c814cf8612666e86f171f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -6,13 +6,13 @@ InspIRCd is a modular C++ Internet Relay Chat (IRC) server for UNIX-like and Win
 
 InspIRCd is supported on on the following platforms:
 
-- Most recent BSD variants using the Clang or GCC compilers and the BSD or GNU toolchains (Make, etc).
+- Most recent BSD variants using the Clang or GCC compilers and the GNU toolchains (Make, etc).
 
 - Most recent Linux distributions using the Clang or GCC compilers and the GNU toolchain.
 
-- The most recent three major releases of macOS using the AppleClang, Clang, or GCC (*not* LLVM-GCC) compilers and the BSD or GNU toolchains.
+- The most recent three major releases of macOS using the AppleClang, Clang, or GCC (*not* LLVM-GCC) compilers and the GNU toolchains.
 
-- Windows 7 or newer using the MSVC 11 (Visual Studio 2012) compiler and CMake 2.8 or newer.
+- 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.
 
@@ -20,13 +20,19 @@ If you encounter any bugs then [please file an issue](https://github.com/inspirc
 
 ## 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 $(git describe --abbrev=0 --tags 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/insp20/win/README.txt) if you wish to do this.
+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.