Release v3.0.0 release candidate 1.

diff --git a/README.md b/README.md
index be5d1ceadc884b478c8c814cf8612666e86f171f..fd0ba2b00f28b2c4ad8316d31965c54429d783f4 100644 (file)
--- a/README.md
+++ b/README.md
@@ -20,8 +20,6 @@ If you encounter any bugs then [please file an issue](https://github.com/inspirc
 
 ## Installation
 
 
 ## 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/master/win/README.txt) if you wish to do this.
 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.

diff --git a/configure b/configure
index 08022d5ec4b8609be85469dddd286c106e8eeac1..f61143974b3be57a884ad089d025dd6e320394ef 100755 (executable)
--- a/configure
+++ b/configure
@@ -244,7 +244,7 @@ affect the running of your server. It is recommended that you use a stable
 version instead.
 
 You can obtain the latest stable version from http://www.inspircd.org/ or by
 version instead.
 
 You can obtain the latest stable version from http://www.inspircd.org/ or by

-running `<|GREEN git checkout $(git describe --abbrev=0 --tags insp20)|>` if you are
+running `<|GREEN git checkout $(git describe --abbrev=0 --tags insp3)|>` if you are

 installing from Git.
 EOW
        if (!prompt_bool $interactive, 'I understand this warning and want to continue anyway.', $opt_development // 0) {
 installing from Git.
 EOW
        if (!prompt_bool $interactive, 'I understand this warning and want to continue anyway.', $opt_development // 0) {

diff --git a/include/modules.h b/include/modules.h
index b4f13c6b72e44df665c32e71390071db9782fd74..b8c860fbcfd47339744d6f7524ddfedf6666d2aa 100644 (file)
--- a/include/modules.h
+++ b/include/modules.h
@@ -99,7 +99,8 @@ struct ModResult {
 /** InspIRCd major version.
  * 1.2 -> 102; 2.1 -> 201; 2.12 -> 212
  */
 /** InspIRCd major version.
  * 1.2 -> 102; 2.1 -> 201; 2.12 -> 212
  */

-#define INSPIRCD_VERSION_MAJ 202
+#define INSPIRCD_VERSION_MAJ 300
+

 /** InspIRCd API version.
  * If you change any API elements, increment this value. This counter should be
  * reset whenever the major version is changed. Modules can use these two values
 /** InspIRCd API version.
  * If you change any API elements, increment this value. This counter should be
  * reset whenever the major version is changed. Modules can use these two values

diff --git a/src/version.sh b/src/version.sh
index 3c9a04b6e9086d515b65ea70e529bdebfc95ee7e..5cdca40900f112a4aa417f4d0f1ecee8ca4fb95b 100755 (executable)
--- a/src/version.sh
+++ b/src/version.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
 #!/bin/sh

-echo "InspIRCd-3.0.0-a10"
+echo "InspIRCd-3.0.0-rc1"