Fix an oversight in mkversions that caused it to not update extras.

diff --git a/src/modules/extra/m_geo_maxmind.cpp b/src/modules/extra/m_geo_maxmind.cpp
index 984a2c6cb32c6e8aee75caa21a970fca4d5f3da2..0d164baa05e0688f7914ca2c052d95a738a8dca5 100644 (file)
--- a/src/modules/extra/m_geo_maxmind.cpp
+++ b/src/modules/extra/m_geo_maxmind.cpp
@@ -154,7 +154,7 @@ class ModuleGeoMaxMind : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides Geolocation lookups using the libMaxMindDB library", VF_VENDOR);
+               return Version("Allows the server to perform geolocation lookups on both IP addresses and users.", VF_VENDOR);
        }
 
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE

diff --git a/src/modules/extra/m_ldap.cpp b/src/modules/extra/m_ldap.cpp
index 874306e62982ef94305f43a4b25ba73e7dca9b1d..80a055f199c08b3739c5ba778c86b367142de988 100644 (file)
--- a/src/modules/extra/m_ldap.cpp
+++ b/src/modules/extra/m_ldap.cpp
@@ -636,7 +636,7 @@ class ModuleLDAP : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides LDAP support", VF_VENDOR);
+               return Version("Provides the ability for LDAP modules to query a LDAP directory.", VF_VENDOR);
        }
 };
 

diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index 92a77e218409210dc234650a7b9012f8cacb9dfa..ff2a7a0320379011764ba3ea1723d08e6a2ab9b9 100644 (file)
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -556,7 +556,7 @@ void ModuleSQL::OnUnloadModule(Module* mod)
 
 Version ModuleSQL::GetVersion()
 {
-       return Version("Provides MySQL support", VF_VENDOR);
+       return Version("Provides the ability for SQL modules to query a MySQL database.", VF_VENDOR);
 }
 
 void DispatcherThread::Run()

diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index 8bd934e917160dc662d5672136be80c2fa222b88..20c17783a588f69c14298fa514df50c1c258dfaa 100644 (file)
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -620,7 +620,7 @@ class ModulePgSQL : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides PostgreSQL support to modules", VF_VENDOR);
+               return Version("Provides the ability for SQL modules to query a PostgreSQL database.", VF_VENDOR);
        }
 };
 

diff --git a/src/modules/extra/m_regex_stdlib.cpp b/src/modules/extra/m_regex_stdlib.cpp
index 80cf299f1cdb576b5e0d0cf61978b11956f30220..aecb37dd673985d12eeb97f382dc9cd87ab4440c 100644 (file)
--- a/src/modules/extra/m_regex_stdlib.cpp
+++ b/src/modules/extra/m_regex_stdlib.cpp
@@ -69,7 +69,7 @@ public:
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Regex Provider Module for std::regex", VF_VENDOR);
+               return Version("Provides a regular expression engine which uses the C++11 std::regex regular expression matching system.", VF_VENDOR);
        }
 
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE

diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index c733b6d99d531226fc2c8af9b1813de2798fe7da..4d92161234b46ca231a88621176748e532904534 100644 (file)
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -1405,7 +1405,7 @@ class ModuleSSLGnuTLS : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Allows TLS encrypted connections using the GnuTLS library.", VF_VENDOR);
+               return Version("Allows TLS (SSL) encrypted connections using the GnuTLS library.", VF_VENDOR);
        }
 
        ModResult OnCheckReady(LocalUser* user) CXX11_OVERRIDE

diff --git a/src/modules/extra/m_ssl_mbedtls.cpp b/src/modules/extra/m_ssl_mbedtls.cpp
index d330afe51a45e9087ca497b08a7ed9192bd201ab..dded7e17146bc7e327aff629a49e4eadeae0407e 100644 (file)
--- a/src/modules/extra/m_ssl_mbedtls.cpp
+++ b/src/modules/extra/m_ssl_mbedtls.cpp
@@ -977,7 +977,7 @@ class ModuleSSLmbedTLS : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides SSL support via mbedTLS (PolarSSL)", VF_VENDOR);
+               return Version("Allows TLS (SSL) encrypted connections using the mbedTLS library.", VF_VENDOR);
        }
 };
 

diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index 0ecd8444dac239df67028ad86ca183a0786d6cb0..330055e4a1a31363890d7a53242ff8969ac6042e 100644 (file)
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -1095,7 +1095,7 @@ class ModuleSSLOpenSSL : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Allows TLS encrypted connections using the OpenSSL library.", VF_VENDOR);
+               return Version("Allows TLS (SSL) encrypted connections using the OpenSSL library.", VF_VENDOR);
        }
 };
 

diff --git a/src/modules/extra/m_sslrehashsignal.cpp b/src/modules/extra/m_sslrehashsignal.cpp
index e1f61c5103b7e188592c6388bcd971171d374cc7..c0cf8fadaab41cc8453bab02d0de6dcbfdfb11f2 100644 (file)
--- a/src/modules/extra/m_sslrehashsignal.cpp
+++ b/src/modules/extra/m_sslrehashsignal.cpp
@@ -56,7 +56,7 @@ class ModuleSSLRehashSignal : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Allows the SIGUSR1 signal to be sent to the server to reload SSL certificates.", VF_VENDOR);
+               return Version("Allows the SIGUSR1 signal to be sent to the server to reload TLS (SSL) certificates.", VF_VENDOR);
        }
 };
 

diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp
index 2c84c114bfd9e152e0d896c99a9f1f80cf4336db..4f784c87cbd46537ea672a617f92739a9b52b970 100644 (file)
--- a/src/modules/m_sslinfo.cpp
+++ b/src/modules/m_sslinfo.cpp
@@ -215,7 +215,7 @@ class ModuleSSLInfo
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Adds user facing SSL information, various SSL configuration options, and the /SSLINFO command to look up SSL certificate information for other users.", VF_VENDOR);
+               return Version("Adds user facing TLS (SSL) information, various TLS (SSL) configuration options, and the /SSLINFO command to look up TLS (SSL) certificate information for other users.", VF_VENDOR);
        }
 
        void OnWhois(Whois::Context& whois) CXX11_OVERRIDE

diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index dcf260be0d9086a58d50c5195bd685bee1bb9ea8..27f7a4af1472aa0bd3b3b008a7369a9a6d8a418f 100644 (file)
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -243,7 +243,7 @@ class ModuleSSLModes
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Adds channel mode z (sslonly) which prevents users who are not connecting using SSL from joining the channel and user mode z (sslqueries) to prevent messages from non-SSL users.", VF_VENDOR);
+               return Version("Adds channel mode z (sslonly) which prevents users who are not connecting using TLS (SSL) from joining the channel and user mode z (sslqueries) to prevent messages from non-SSL users.", VF_VENDOR);
        }
 };
 

diff --git a/tools/mkversions b/tools/mkversions
index f5096b15bd948ae87aa3e153a784d52fc49b12ba..ee29f48e9c346d075afb5ca7f667294997654b2a 100755 (executable)
--- a/tools/mkversions
+++ b/tools/mkversions
@@ -51,7 +51,7 @@ my %version = get_version();
 my $docdir = rel2abs catdir $ARGV[0], 'docs', $version{MAJOR}, 'modules';
 print_error "unable to find the module directory at $docdir!" unless -d $docdir;
 
-for my $module (<src/modules/m_*.cpp>, <src/modules/m_*/main.cpp>) {
+for my $module (<src/modules/extra/m_*.cpp>, <src/modules/m_*.cpp>, <src/modules/m_*/main.cpp>) {
        print_error "unable to extract module name from $module!" unless $module =~ /m_(\w+)[.\/]/;
        my $docfile = catfile $docdir, "$1.md";
        print_error "unable to find the module documentation at $docfile!" unless -f $docfile;