Sync helpop chmodes s and p with docs

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

diff --git a/README.md b/README.md
index 8c491cda9f9d0405a9982f64c759e4275d7a9de0..7cabb879c913fdb49ad93b23226eb905066c18f0 100644 (file)
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ InspIRCd is a modular C++ Internet Relay Chat (IRC) server for UNIX-like and Win
 
 ## Supported Platforms
 
-InspIRCd is supported on on the following platforms:
+InspIRCd is supported on the following platforms:
 
 - Most recent BSD variants using the Clang or GCC compilers and the GNU toolchains (Make, etc).
 
@@ -16,23 +16,17 @@ InspIRCd is supported on on the following platforms:
 
 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).
+If you encounter any bugs then [please file an issue](https://github.com/inspircd/inspircd/issues/new/choose).
 
 ## 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).
+Most InspIRCd users running a UNIX-like system build from source. A guide about how to do this is available on [the InspIRCd docs site](https://docs.inspircd.org/3/installation/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.
 
@@ -43,7 +37,8 @@ InspIRCd is licensed under [version 2 of the GNU General Public License](https:/
 ## External Links
 
 * [Website](https://www.inspircd.org)
-* [Documentation](https://wiki.inspircd.org)
+* [Documentation](https://docs.inspircd.org)
 * [GitHub](https://github.com/inspircd)
-* [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
+* Support IRC channel &mdash; \#inspircd on irc.inspircd.org
+* Development IRC channel &mdash; \#inspircd.dev on irc.inspircd.org
+* InspIRCd test network &mdash; testnet.inspircd.org