12 files changed, 12 insertions, 12 deletions
diff --git a/src/modules/extra/m_geo_maxmind.cpp b/src/modules/extra/m_geo_maxmind.cpp
index 984a2c6cb..0d164baa0 100644
--- 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 874306e62..80a055f19 100644
--- 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 92a77e218..ff2a7a032 100644
--- 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 8bd934e91..20c17783a 100644
--- 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 80cf299f1..aecb37dd6 100644
--- 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 c733b6d99..4d9216123 100644
--- 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 d330afe51..dded7e171 100644
--- 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 0ecd8444d..330055e4a 100644
--- 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 e1f61c510..c0cf8fada 100644
--- 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 2c84c114b..4f784c87c 100644
--- 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 dcf260be0..27f7a4af1 100644
--- 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 f5096b15b..ee29f48e9 100755
--- 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;