inspircd

A modular C++ IRC daemon (ircd). https://www.inspircd.org/
Log | Files | Refs | README

commit 87b1461e2a4710a38b32186c2582da9fe9bb3804
parent 1f6b27d64ee917cd4df18fb21cc9af680939448d
Author: Peter Powell <petpow@saberuk.com>
Date:   Wed,  1 May 2019 15:25:23 +0100

Merge branch 'insp20' into insp3.

Diffstat:
MREADME.md | 4++--
Mdocs/conf/inspircd.conf.example | 4++--
Mdocs/conf/links.conf.example | 6+++---
Mdocs/conf/modules.conf.example | 36++++++++++++++++++------------------
Mdocs/conf/motd.txt.example | 2+-
Mdocs/conf/opermotd.txt.example | 2+-
Mmake/template/main.mk | 4++--
Msrc/modules/extra/README | 4++--
Msrc/modules/m_spanningtree/main.h | 2+-
9 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/README.md b/README.md @@ -20,7 +20,7 @@ If you encounter any bugs then [please file an issue](https://github.com/inspirc ## Installation -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. @@ -41,7 +41,7 @@ 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 diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example @@ -154,7 +154,7 @@ # ssl: If you want the port(s) in this bind tag to use SSL, set this to # the name of a custom <sslprofile> tag that you have defined or one # of "openssl", "gnutls", "mbedtls" if you have not defined any. See the - # wiki page for the SSL module you are using for more details. + # docs page for the SSL module you are using for more details. # # You will need to load the ssl_openssl module for OpenSSL, ssl_gnutls # for GnuTLS and ssl_mbedtls for mbedTLS. @@ -189,7 +189,7 @@ #<bind path="/tmp/inspircd.sock" type="clients"> # You can define a custom <sslprofile> tag which defines the SSL configuration -# for this listener. See the wiki page for the SSL module you are using for +# for this listener. See the docs page for the SSL module you are using for # more details. # # Alternatively, you can use one of the default SSL profiles which are created diff --git a/docs/conf/links.conf.example b/docs/conf/links.conf.example @@ -39,7 +39,7 @@ # ssl: If defined, this states the SSL profile that will be used when # making an outbound connection to the server. Options are the name of an # <sslprofile> tag that you have defined or one of "openssl", "gnutls", - # "mbedtls" if you have not defined any. See the wiki page for the SSL + # "mbedtls" if you have not defined any. See the docs page for the SSL # module you are using for more details. # # You will need to load the ssl_openssl module for OpenSSL, ssl_gnutls @@ -49,8 +49,8 @@ # fingerprint: If defined, this option will force servers to be # authenticated using SSL certificate fingerprints. See - # https://wiki.inspircd.org/SSL for more information. This will - # require an SSL link for both inbound and outbound connections. + # https://docs.inspircd.org/3/modules/spanningtree for more information. + # This will require an SSL link for both inbound and outbound connections. #fingerprint="" # bind: Local IP address to bind to. diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example @@ -10,7 +10,7 @@ # # # By default, ALL modules are commented out. You must uncomment them # # or add lines to your config to load modules. Please refer to # -# https://wiki.inspircd.org/3.0/Modules for a list of modules and # +# https://docs.inspircd.org/3/modules for a list of modules and # # each modules link for any additional conf tags they require. # # # # ____ _ _____ _ _ ____ _ _ _ # @@ -822,8 +822,8 @@ # more blacklists. # #<module name="dnsbl"> # # -# For configuration options please see the wiki page for dnsbl at # -# https://wiki.inspircd.org/Modules/3.0/dnsbl # +# For configuration options please see the docs page for dnsbl at # +# https://docs.inspircd.org/3/modules/dnsbl # #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # Exempt channel operators module: Provides support for allowing # @@ -1013,7 +1013,7 @@ # #-#-#-#-#-#-#-#-#-#-#- HOSTCHANGE CONFIGURATION -#-#-#-#-#-#-#-#-#-# # # -# See https://wiki.inspircd.org/Modules/3.0/hostchange for help. # +# See https://docs.inspircd.org/3/modules/hostchange for help. # # # #<hostchange mask="*@42.theanswer.example.org" action="addaccount" suffix=".users.example.com"> #<hostchange mask="*root@*" action="addnick" prefix="example/users/"> @@ -1365,8 +1365,8 @@ # #-#-#-#-#-#-#-#-#-#-#-#- SQL CONFIGURATION -#-#-#-#-#-#-#-#-#-#-#-#-# # # -# mysql is more complex than described here, see the wiki for more # -# info: https://wiki.inspircd.org/Modules/3.0/mysql # +# mysql is more complex than described here, see the docs for more # +# info: https://docs.inspircd.org/3/modules/mysql # # #<database module="mysql" name="mydb" user="myuser" pass="mypass" host="localhost" id="my_database2"> @@ -1536,7 +1536,7 @@ # # # Much of override's configuration relates to your oper blocks. # # For more information on how to allow opers to override, see: # -# https://wiki.inspircd.org/Modules/3.0/override # +# https://docs.inspircd.org/3/modules/override # # # # noisy - If enabled, all oper overrides will be announced # # via channel notice. # @@ -1654,8 +1654,8 @@ # #-#-#-#-#-#-#-#-#-#-#-#- SQL CONFIGURATION -#-#-#-#-#-#-#-#-#-#-#-#-# # # -# pgsql is more complex than described here, see the wiki for # -# more: https://wiki.inspircd.org/Modules/3.0/pgsql # +# pgsql is more complex than described here, see the docs for # +# more: https://docs.inspircd.org/3/modules/pgsql # # #<database module="pgsql" name="mydb" user="myuser" pass="mypass" host="localhost" id="my_database" ssl="no"> @@ -2083,8 +2083,8 @@ # #-#-#-#-#-#-#-#-#-#-#- GNUTLS CONFIGURATION -#-#-#-#-#-#-#-#-#-#-#-# # # -# ssl_gnutls is too complex to describe here, see the wiki: # -# https://wiki.inspircd.org/Modules/3.0/ssl_gnutls # +# ssl_gnutls is too complex to describe here, see the docs: # +# https://docs.inspircd.org/3/modules/ssl_gnutls # #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # SSL info module: Allows users to retrieve information about other @@ -2114,8 +2114,8 @@ # #-#-#-#-#-#-#-#-#-#-#- OPENSSL CONFIGURATION -#-#-#-#-#-#-#-#-#-#-#-# # # -# ssl_openssl is too complex to describe here, see the wiki: # -# https://wiki.inspircd.org/Modules/3.0/ssl_openssl # +# ssl_openssl is too complex to describe here, see the docs: # +# https://docs.inspircd.org/3/modules/ssl_openssl # #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # Strip color module: Adds channel mode +S that strips color codes and @@ -2144,8 +2144,8 @@ # #-#-#-#-#-#-#-#-#-#-#-#- SQL CONFIGURATION -#-#-#-#-#-#-#-#-#-#-#-#-# # # -# sqlite is more complex than described here, see the wiki for more # -# info: https://wiki.inspircd.org/Modules/3.0/sqlite3 # +# sqlite is more complex than described here, see the docs for more # +# info: https://docs.inspircd.org/3/modules/sqlite3 # # #<database module="sqlite" hostname="/full/path/to/database.db" id="anytext"> @@ -2157,8 +2157,8 @@ # #-#-#-#-#-#-#-#-#-#-#- SQLAUTH CONFIGURATION -#-#-#-#-#-#-#-#-#-#-#-# # # -# sqlauth is too complex to describe here, see the wiki: # -# https://wiki.inspircd.org/Modules/3.0/sqlauth # +# sqlauth is too complex to describe here, see the docs: # +# https://docs.inspircd.org/3/modules/sqlauth # #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # SQL oper module: Allows you to store oper credentials in an SQL @@ -2172,7 +2172,7 @@ # # # dbid - Database ID to use (see SQL modules). # # # -# See also: https://wiki.inspircd.org/Modules/3.0/sqloper # +# See also: https://docs.inspircd.org/3/modules/sqloper # # # #<sqloper dbid="1"> diff --git a/docs/conf/motd.txt.example b/docs/conf/motd.txt.example @@ -28,7 +28,7 @@ / \ / * Web: https://www.inspircd.org \ | * IRC: irc.inspircd.org #inspircd | - | * Docs: https://wiki.inspircd.org | + | * Docs: https://docs.inspircd.org | | * Bugs: https://inspircd.org/bugs | | | | We hope you like this software. Please do | diff --git a/docs/conf/opermotd.txt.example b/docs/conf/opermotd.txt.example @@ -28,7 +28,7 @@ / \ / * Web: https://www.inspircd.org \ | * IRC: irc.inspircd.org #inspircd | - | * Docs: https://wiki.inspircd.org | + | * Docs: https://docs.inspircd.org | | * Bugs: https://inspircd.org/bugs | | | | We hope you like this software. Please do | diff --git a/make/template/main.mk b/make/template/main.mk @@ -188,8 +188,8 @@ std-header: @echo "* BUILDING INSPIRCD *" @echo "* *" @echo "* This will take a *long* time. *" - @echo "* Why not read our wiki at *" - @echo "* https://wiki.inspircd.org *" + @echo "* Why not read our docs at *" + @echo "* https://docs.inspircd.org *" @echo "* while you wait for Make to run? *" @echo "*************************************" diff --git a/src/modules/extra/README b/src/modules/extra/README @@ -1,8 +1,8 @@ This directory stores modules which require external libraries to compile. -For example, m_filter_pcre requires the PCRE libraries. +For example, m_regex_pcre requires the PCRE libraries. To compile any of these modules first ensure you have the required dependencies -(read the online documentation at https://wiki.inspircd.org) and then symlink +(read the online documentation at https://docs.inspircd.org) and then symlink the .cpp file from this directory into the parent directory (src/modules/). Alternatively, use the command: ./configure --enable-extras=m_extra.cpp, which will diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h @@ -36,7 +36,7 @@ * If you completely change the protocol, completely change the number. * * IMPORTANT: If you make changes, document your changes here, without fail: - * https://wiki.inspircd.org/List_of_protocol_changes_between_versions + * https://docs.inspircd.org/developer/spanningtree/ * * Failure to document your protocol changes will result in a painfully * painful death by pain. You have been warned.