diff --git a/Config b/Config index 02da4a38e..f8bc78fd2 100755 --- a/Config +++ b/Config @@ -418,7 +418,7 @@ fi TEST="$BASEPATH" echo "" echo "In what directory do you want to install UnrealIRCd?" -echo "(Note: UnrealIRCd 5 will need to be installed somewhere." +echo "(Note: UnrealIRCd 6 will need to be installed somewhere." echo " If this directory does not exist it will be created.)" echo $n "[$TEST] -> $c" read cc diff --git a/doc/Config.header b/doc/Config.header index 32ee7b7c8..8566bda34 100644 --- a/doc/Config.header +++ b/doc/Config.header @@ -16,15 +16,15 @@ A short installation guide is available online at: https://www.unrealircd.org/docs/Installing_from_source Full documentation is available at: -https://www.unrealircd.org/docs/UnrealIRCd_5_documentation +https://www.unrealircd.org/docs/UnrealIRCd_6_documentation -------------------------------------------------------------------------------------- The full release notes are available in doc/RELEASE-NOTES.md For easier viewing, check out the latest online release notes at: -https://github.com/unrealircd/unrealircd/blob/unreal52/doc/RELEASE-NOTES.md +https://github.com/unrealircd/unrealircd/blob/unreal60_dev/doc/RELEASE-NOTES.md -UnrealIRCd 5 is compatible with the following services: +UnrealIRCd 6 is compatible with the following services: * anope with the "unreal4" protocol module - version 2.0.7 or higher required! * atheme with the "unreal4" protocol module - tested with version 7.2.9 diff --git a/doc/conf/examples/example.conf b/doc/conf/examples/example.conf index 64f184d59..4af426968 100644 --- a/doc/conf/examples/example.conf +++ b/doc/conf/examples/example.conf @@ -1,4 +1,4 @@ -/* Configuration file for UnrealIRCd 5 +/* Configuration file for UnrealIRCd 6 * * Simply copy this file to your conf/ directory, call it * 'unrealircd.conf' and walk through it line by line (edit it!) @@ -12,8 +12,8 @@ * this only takes a few minutes and will help you a lot: * https://www.unrealircd.org/docs/Configuration#Configuration_file_syntax * - * UnrealIRCd 5 documentation (very extensive!): - * https://www.unrealircd.org/docs/UnrealIRCd_5_documentation + * UnrealIRCd 6 documentation (very extensive!): + * https://www.unrealircd.org/docs/UnrealIRCd_6_documentation * * Frequently Asked Questions: * https://www.unrealircd.org/docs/FAQ diff --git a/doc/conf/examples/example.fr.conf b/doc/conf/examples/example.fr.conf index 3268fb8eb..a9f181d08 100644 --- a/doc/conf/examples/example.fr.conf +++ b/doc/conf/examples/example.fr.conf @@ -1,4 +1,4 @@ -/* Fichier de configuration pour UnrealIRCd 5 +/* Fichier de configuration pour UnrealIRCd 6 * * Copiez ce fichier dans le répertoire conf/, renommez le * 'unrealircd.conf' et parcourez-le ligne par ligne (modifiez le !) @@ -13,8 +13,8 @@ * beaucoup : * https://www.unrealircd.org/docs/Configuration#Configuration_file_syntax * - * Documentation pour UnrealIRCd 5 (très complète !) : - * https://www.unrealircd.org/docs/UnrealIRCd_5_documentation/fr + * Documentation pour UnrealIRCd 6 (très complète !) : + * https://www.unrealircd.org/docs/UnrealIRCd_6_documentation/fr * * Foire Aux Questions : * https://www.unrealircd.org/docs/FAQ diff --git a/doc/conf/examples/example.tr.conf b/doc/conf/examples/example.tr.conf index 70d781e1f..43b3fd645 100644 --- a/doc/conf/examples/example.tr.conf +++ b/doc/conf/examples/example.tr.conf @@ -1,4 +1,4 @@ -/* UnrealIRCd 5 için yapılandırma dosyası +/* UnrealIRCd 6 için yapılandırma dosyası * Türkçe Çeviri: Diablo - (Serkan Sepetçi) * İletişim: irc.trirc.com:6667 - diablo@unrealircd.org * @@ -14,8 +14,8 @@ * bu size bilgi edinmeniz açısından yardımcı olacaktır: * https://www.unrealircd.org/docs/Configuration#Configuration_file_syntax * - * UnrealIRCd 5 belgeleme (çok geniş!): - * https://www.unrealircd.org/docs/UnrealIRCd_5_documentation + * UnrealIRCd 6 belgeleme (çok geniş!): + * https://www.unrealircd.org/docs/UnrealIRCd_6_documentation * * Sıkça Sorulan Sorular: * https://www.unrealircd.org/docs/FAQ diff --git a/doc/conf/help/help.conf b/doc/conf/help/help.conf index ccb4ce58c..a93c5f278 100644 --- a/doc/conf/help/help.conf +++ b/doc/conf/help/help.conf @@ -1,4 +1,4 @@ -/* UnrealIRCd 5 Help Configuration +/* UnrealIRCd 6 Help Configuration * Based on the original help text written by hAtbLaDe * Revised by CC (07/2002) and many others */ diff --git a/doc/conf/help/help.de.conf b/doc/conf/help/help.de.conf index e57b4d163..005dabc15 100644 --- a/doc/conf/help/help.de.conf +++ b/doc/conf/help/help.de.conf @@ -1,4 +1,4 @@ -/* UnrealIRCd 5 Help Configuration +/* UnrealIRCd 6 Help Configuration * Based on the original help text written by hAtbLaDe * Revised by CC (07/2002) and many others * diff --git a/doc/conf/help/help.es.conf b/doc/conf/help/help.es.conf index b5b484249..fa07b6f02 100644 --- a/doc/conf/help/help.es.conf +++ b/doc/conf/help/help.es.conf @@ -1,4 +1,4 @@ -/* UnrealIRCd 5 Help Configuration +/* UnrealIRCd 6 Help Configuration * Based on the original help text written by hAtbLaDe * Revised by CC (07/2002) and many others * diff --git a/doc/conf/help/help.fr.conf b/doc/conf/help/help.fr.conf index 1eea248bd..5ce5103f3 100644 --- a/doc/conf/help/help.fr.conf +++ b/doc/conf/help/help.fr.conf @@ -1,4 +1,4 @@ -/* UnrealIRCd 5 Help Configuration +/* UnrealIRCd 6 Help Configuration * Basé sur l'aide originale écrite par hAtbLaDe * Révisé par CC (07/2002) * Ancien traducteur français : babass diff --git a/doc/conf/help/help.it.conf b/doc/conf/help/help.it.conf index dd334c13b..2dffdb2b6 100644 --- a/doc/conf/help/help.it.conf +++ b/doc/conf/help/help.it.conf @@ -1,4 +1,4 @@ -/* UnrealIRCd 5 Help Configuration +/* UnrealIRCd 6 Help Configuration * Based on the original help text written by hAtbLaDe * Revised by CC (07/2002) and many others * diff --git a/doc/conf/help/help.nl.conf b/doc/conf/help/help.nl.conf index b41a32b4b..392d538a8 100644 --- a/doc/conf/help/help.nl.conf +++ b/doc/conf/help/help.nl.conf @@ -1,4 +1,4 @@ -/* UnrealIRCd 5 helpconfiguratie +/* UnrealIRCd 6 helpconfiguratie * Gebaseerd op de originele helptekst geschreven door hAtbLaDe * Vertaald door Stanley (irc.chattersworld.nl * Herzien door CC (07/2002) en vele andere. diff --git a/doc/conf/help/help.pl.conf b/doc/conf/help/help.pl.conf index 24f4b8415..496ea3bdc 100644 --- a/doc/conf/help/help.pl.conf +++ b/doc/conf/help/help.pl.conf @@ -1,4 +1,4 @@ -/* UnrealIRCd 5 Help Configuration +/* UnrealIRCd 6 Help Configuration * Based on the original help text written by hAtbLaDe * Revised by CC (07/2002) and many others */ diff --git a/doc/conf/help/help.ru.conf b/doc/conf/help/help.ru.conf index 7f994ad80..1b67b5d02 100644 --- a/doc/conf/help/help.ru.conf +++ b/doc/conf/help/help.ru.conf @@ -1,4 +1,4 @@ -/* UnrealIRCd 5 Help Configuration +/* UnrealIRCd 6 Help Configuration * Based on the original help text written by hAtbLaDe * Revised by CC (07/2002) * diff --git a/doc/conf/help/help.tr.conf b/doc/conf/help/help.tr.conf index 773bda27b..fe5b7fea7 100644 --- a/doc/conf/help/help.tr.conf +++ b/doc/conf/help/help.tr.conf @@ -1,4 +1,4 @@ -/* UnrealIRCd 5 Yardım Yapılandırması +/* UnrealIRCd 6 Yardım Yapılandırması * * Orjinal yardım metnini yazan by hAtbLaDe * Gözden geçiren by CC (07/2002) ve diğerleri diff --git a/doc/conf/modules.sources.list b/doc/conf/modules.sources.list index f4c4b8189..7d2ae64f1 100644 --- a/doc/conf/modules.sources.list +++ b/doc/conf/modules.sources.list @@ -9,7 +9,7 @@ # # This is the unrealircd-contrib repository which is added by default in -# UnrealIRCd 5 to make it easy for users to install 3rd party modules. +# UnrealIRCd to make it easy for users to install 3rd party modules. # If you are a module coder and want to add your module to this repository # as well, then read the rules and procedure at: # https://www.unrealircd.org/docs/Rules_for_3rd_party_modules_in_unrealircd-contrib diff --git a/doc/translations.txt b/doc/translations.txt index 800c00a13..a89c6d8ed 100644 --- a/doc/translations.txt +++ b/doc/translations.txt @@ -1,6 +1,6 @@ ==[ Translations ]=========================================================== -In UnrealIRCd 5 we support the following translations: +In UnrealIRCd we support the following translations: * on-line documentation at https://www.unrealircd.org/docs/ (wiki!) * help.conf * example.conf diff --git a/extras/doxygen/Developers.md b/extras/doxygen/Developers.md index 85be6d146..2344f7dbe 100644 --- a/extras/doxygen/Developers.md +++ b/extras/doxygen/Developers.md @@ -1,4 +1,4 @@ -Welcome to the doxygen-generated documentation for the UnrealIRCd 5.x API. +Welcome to the doxygen-generated documentation for the UnrealIRCd 6.x API. This is intended **for developers only!** If you are creating a 3rd party module for UnrealIRCd or are interested diff --git a/extras/security/apparmor/unrealircd b/extras/security/apparmor/unrealircd index c9eb837c2..e6c9a0a37 100644 --- a/extras/security/apparmor/unrealircd +++ b/extras/security/apparmor/unrealircd @@ -1,9 +1,9 @@ -# AppArmor profile for UnrealIRCd 5 +# AppArmor profile for UnrealIRCd 6 # # Note that you may still see some DENIED warnings in logs with # operation="chmod". These are harmless and can be safely ignored. # -# Tested on Ubuntu 16.04 LTS and Ubuntu 18.04 LTS +# Tested on Ubuntu 16.04 LTS, Ubuntu 18.04 LTS, Ubuntu 20.04 LTS # # IMPORTANT: you will have to modify the path to executable below # if it's not /home/ircd/unrealircd/bin/unrealircd ! diff --git a/include/config.h b/include/config.h index ca2cf094c..9156eb781 100644 --- a/include/config.h +++ b/include/config.h @@ -209,7 +209,7 @@ * when there is no socket data waiting for us (no clients sending anything). * Was 2000ms in 3.2.x, 1000ms for versions below 3.4-alpha4. * 500ms in UnrealIRCd 4 (?) - * 250ms in UnrealIRCd 5. + * 250ms in UnrealIRCd 5 and UnrealIRCd 6. */ #define SOCKETLOOP_MAX_DELAY 250 diff --git a/src/macosx/UnrealIRCd/AppModel.swift b/src/macosx/UnrealIRCd/AppModel.swift index 7cb457080..5fff8bab4 100644 --- a/src/macosx/UnrealIRCd/AppModel.swift +++ b/src/macosx/UnrealIRCd/AppModel.swift @@ -13,7 +13,7 @@ class AppModel : ChangeNotifierDelegate { var menuItem : NSStatusItem static let logoName = "logo.png" - static let helpURL = "https://www.unrealircd.org/docs/UnrealIRCd_5_documentation" + static let helpURL = "https://www.unrealircd.org/docs/UnrealIRCd_6_documentation" var daemonModel : DaemonModel var configurationModel : ConfigurationModel var windowController : NSWindowController? diff --git a/src/modules/join.c b/src/modules/join.c index 8fbef02c8..8dca19ef2 100644 --- a/src/modules/join.c +++ b/src/modules/join.c @@ -367,7 +367,7 @@ void _do_join(Client *client, int parc, const char *parv[]) } if (*name == '0' && !atoi(name)) { - /* UnrealIRCd 5: we only support "JOIN 0", + /* UnrealIRCd 5+: we only support "JOIN 0", * "JOIN 0,#somechan" etc... so only at the beginning. * We do not support it half-way like "JOIN #a,0,#b" * since that doesn't make sense, unless you are flooding... diff --git a/src/windows/UnrealIRCd.exe.manifest b/src/windows/UnrealIRCd.exe.manifest index 265d650e2..ab94290c4 100644 --- a/src/windows/UnrealIRCd.exe.manifest +++ b/src/windows/UnrealIRCd.exe.manifest @@ -2,8 +2,8 @@ Internet Relay Chat Daemon diff --git a/src/windows/gui.c b/src/windows/gui.c index 0d41b995f..3c199a14e 100644 --- a/src/windows/gui.c +++ b/src/windows/gui.c @@ -199,7 +199,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi DWORD need; /* Go one level up, since we are currently in the bin\ subdir - * and we want to be in (f.e.) "C:\Program Files\UnrealIRCd 5" + * and we want to be in (f.e.) "C:\Program Files\UnrealIRCd 6" */ chdir(".."); diff --git a/src/windows/service.c b/src/windows/service.c index d4dafb49a..7db873d4f 100644 --- a/src/windows/service.c +++ b/src/windows/service.c @@ -111,7 +111,7 @@ VOID WINAPI ServiceMain(DWORD dwArgc, LPTSTR *lpszArgv) chdir(path); /* Go one level up, since we are currently in the bin\ subdir - * and we want to be in (f.e.) "C:\Program Files\UnrealIRCd 5" + * and we want to be in (f.e.) "C:\Program Files\UnrealIRCd 6" */ chdir(".."); diff --git a/src/windows/unrealsvc.c b/src/windows/unrealsvc.c index adb6d8271..ed360ec24 100644 --- a/src/windows/unrealsvc.c +++ b/src/windows/unrealsvc.c @@ -83,11 +83,11 @@ int main(int argc, char *argv[]) { uChangeServiceConfig2(hService, SERVICE_CONFIG_DESCRIPTION, &info); CloseServiceHandle(hService); printf("\n[!!!] IMPORTANT: By default the network service user cannot write to the \n" - "UnrealIRCd 5 folder and this will make UnrealIRCd fail to boot without\n" + "UnrealIRCd 6 folder and this will make UnrealIRCd fail to boot without\n" "writing any meaningful error to the log files.\n" "You have two options:\n" "1) Manually grant FULL permissions to NT AUTHORITY\\NetworkService\n" - " for the UnrealIRCd 5 folder, all its subfolders and files.\n" + " for the UnrealIRCd 6 folder, all its subfolders and files.\n" "OR, easier and recommended:\n" "2) just re-run the UnrealIRCd installer and select 'Install as a service',\n" " which sets all the necessary permissions automatically.\n");