diff options
| -rw-r--r-- | include/configreader.h | 4 | ||||
| -rw-r--r-- | src/configreader.cpp | 10 | ||||
| -rw-r--r-- | src/modules/m_remove.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/capab.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/compat.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/fjoin.cpp | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/include/configreader.h b/include/configreader.h index fb93adafd..005d4a37d 100644 --- a/include/configreader.h +++ b/include/configreader.h @@ -451,11 +451,11 @@ class CoreExport ServerConfig */ OperIndex OperTypes; - /** Default value for <connect:maxchans>, deprecated in 2.2 + /** Default value for <connect:maxchans>, deprecated in 3.0 */ unsigned int MaxChans; - /** Default value for <oper:maxchans>, deprecated in 2.2 + /** Default value for <oper:maxchans>, deprecated in 3.0 */ unsigned int OperMaxChans; diff --git a/src/configreader.cpp b/src/configreader.cpp index 0299b326a..7a1c8b8ce 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -362,13 +362,13 @@ struct DeprecatedConfig static const DeprecatedConfig ChangedConfig[] = { { "bind", "transport", "", "has been moved to <bind:ssl> as of 2.0" }, { "die", "value", "", "you need to reread your config" }, - { "gnutls", "starttls", "", "has been replaced with m_starttls as of 2.2" }, + { "gnutls", "starttls", "", "has been replaced with m_starttls as of 3.0" }, { "link", "autoconnect", "", "2.0+ does not use this attribute - define <autoconnect> tags instead" }, { "link", "transport", "", "has been moved to <link:ssl> as of 2.0" }, - { "module", "name", "m_chanprotect.so", "has been replaced with m_customprefix as of 2.2" }, - { "module", "name", "m_halfop.so", "has been replaced with m_customprefix as of 2.2" }, - { "options", "cyclehosts", "", "has been replaced with m_hostcycle as of 2.2" }, - { "performance", "nouserdns", "", "has been moved to <connect:resolvehostnames> as of 2.2" } + { "module", "name", "m_chanprotect.so", "has been replaced with m_customprefix as of 3.0" }, + { "module", "name", "m_halfop.so", "has been replaced with m_customprefix as of 3.0" }, + { "options", "cyclehosts", "", "has been replaced with m_hostcycle as of 3.0" }, + { "performance", "nouserdns", "", "has been moved to <connect:resolvehostnames> as of 3.0" } }; void ServerConfig::Fill() diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp index d643bc0cd..5872b5978 100644 --- a/src/modules/m_remove.cpp +++ b/src/modules/m_remove.cpp @@ -108,7 +108,7 @@ class RemoveBase : public Command if (!IS_LOCAL(target)) { // Send an ENCAP REMOVE with parameters being in the old <user> <chan> order which is - // compatible with both 2.0 and 2.2. This also turns FPART into REMOVE. + // compatible with both 2.0 and 3.0. This also turns FPART into REMOVE. std::vector<std::string> p; p.push_back(target->uuid); p.push_back(channel->name); diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp index a2e68aa61..d22481518 100644 --- a/src/modules/m_spanningtree/capab.cpp +++ b/src/modules/m_spanningtree/capab.cpp @@ -45,7 +45,7 @@ std::string TreeSocket::MyModules(int filter) for (ModuleManager::ModuleMap::const_iterator i = modlist.begin(); i != modlist.end(); ++i) { Module* const mod = i->second; - // 2.2 advertises its settings for the benefit of services + // 3.0 advertises its settings for the benefit of services // 2.0 would bork on this if (proto_version < 1205 && i->second->ModuleSourceFile == "m_kicknorejoin.so") continue; diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp index 63fc9cf6c..2436e74f8 100644 --- a/src/modules/m_spanningtree/compat.cpp +++ b/src/modules/m_spanningtree/compat.cpp @@ -253,7 +253,7 @@ void TreeSocket::WriteLine(const std::string& original_line) } else if (command == "SINFO") { - // :22D SINFO version :InspIRCd-2.2 + // :22D SINFO version :InspIRCd-3.0 // A B C std::string::size_type c = line.find(' ', b + 1); if (c == std::string::npos) @@ -424,7 +424,7 @@ bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, std: } else if (cmd == "MODENOTICE") { - // MODENOTICE is always supported by 2.0 but it's optional in 2.2. + // MODENOTICE is always supported by 2.0 but it's optional in 3.0. params.insert(params.begin(), "*"); params.insert(params.begin()+1, cmd); cmd = "ENCAP"; diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp index 41212b517..c292373b3 100644 --- a/src/modules/m_spanningtree/fjoin.cpp +++ b/src/modules/m_spanningtree/fjoin.cpp @@ -85,7 +85,7 @@ CmdResult CommandFJoin::Handle(User* srcuser, std::vector<std::string>& params) * drop the link to avoid desync. * * InspIRCd 2.0 and older required a comma before the uuid even if the user - * had no prefix modes on the channel, InspIRCd 2.2 and later does not require + * had no prefix modes on the channel, InspIRCd 3.0 and later does not require * a comma in this case anymore. * * <membid> is a positive integer representing the id of the membership. |