Describe module purpose in /MODULES output

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11757 e03df62e-2008-0410-955e-edbf42e46eb7

146 files changed, 157 insertions, 154 deletions

diff --git a/include/modules.h b/include/modules.h
index 982d83754..8ae1aa8e1 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -30,6 +30,7 @@ class XLine;
 /** Used to define a set of behavior bits for a module
  */
 enum ModuleFlags {
+	VF_NONE = 0,		// module is not special at all
 	VF_STATIC = 1,		// module is static, cannot be /unloadmodule'd
 	VF_VENDOR = 2,		// module is a vendor module (came in the original tarball, not 3rd party)
 	VF_SERVICEPROVIDER = 4,	// module provides a service to other modules (can be a dependency)
@@ -257,6 +258,9 @@ do { \
 class CoreExport Version : public classbase
 {
  public:
+	/** Module description
+	 */
+	const std::string description;
 	/** Version information.
 	 */
 	const std::string version;
@@ -267,7 +271,7 @@ class CoreExport Version : public classbase
 
 	/** Initialize version class
 	 */
-	Version(const std::string &customver, int flags,
+	Version(const std::string &desc, int flags,
 		int api_ver = API_VERSION, const std::string& src_rev = VERSION " r" REVISION);
 };
 
@@ -448,7 +452,7 @@ class CoreExport Module : public Extensible
 	 * The method should return a Version object with its version information assigned via
 	 * Version::Version
 	 */
-	virtual Version GetVersion();
+	virtual Version GetVersion() = 0;
 
 	/** Called when a user connects.
 	 * The details of the connecting user are available to you in the parameter User *user
diff --git a/src/commands/cmd_modules.cpp b/src/commands/cmd_modules.cpp
index 599eb611b..70406330a 100644
--- a/src/commands/cmd_modules.cpp
+++ b/src/commands/cmd_modules.cpp
@@ -57,17 +57,17 @@ CmdResult CommandModules::Handle (const std::vector<std::string>&, User *user)
 
 		if (user->HasPrivPermission("servers/auspex"))
 		{
-			std::string flags("Svsc");
+			std::string flags("SvscC");
 			int pos = 0;
-			for (int mult = 1; mult <= VF_SERVICEPROVIDER; mult *= 2, ++pos)
+			for (int mult = 1; mult <= VF_OPTCOMMON; mult *= 2, ++pos)
 				if (!(V.Flags & mult))
 					flags[pos] = '-';
 
-			user->WriteNumeric(702, "%s :0x%08lx %s %s :%s", user->nick.c_str(), (unsigned long)m, module_names[i].c_str(), flags.c_str(), V.version.c_str());
+			user->WriteNumeric(702, "%s :0x%08lx %s %s :%s - %s", user->nick.c_str(),(unsigned long)m, module_names[i].c_str(), flags.c_str(), V.description.c_str(), V.version.c_str());
 		}
 		else
 		{
-			user->WriteNumeric(702, "%s :%s",user->nick.c_str(), module_names[i].c_str());
+			user->WriteNumeric(702, "%s :%s %s", user->nick.c_str(), module_names[i].c_str(), V.description.c_str());
 		}
 	}
 	user->WriteNumeric(703, "%s :End of MODULES list",user->nick.c_str());
diff --git a/src/modules.cpp b/src/modules.cpp
index c11b63bec..d38496444 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -28,7 +28,7 @@
 
 // version is a simple class for holding a modules version number
 Version::Version(const std::string &modv, int flags, int api_ver, const std::string& rev)
-: version(modv + " - " + rev), Flags(flags), API(api_ver)
+: description(modv), version(rev), Flags(flags), API(api_ver)
 {
 }
 
@@ -119,7 +119,6 @@ void		Module::OnModuleRehash(User*, const std::string&) { }
 void		Module::OnRehash(User*) { }
 ModResult	Module::OnUserPreJoin(User*, Channel*, const char*, std::string&, const std::string&) { return MOD_RES_PASSTHRU; }
 void		Module::OnMode(User*, void*, int, const std::vector<std::string>&, const std::vector<TranslateType>&) { }
-Version		Module::GetVersion() { return Version("Misconfigured", VF_VENDOR, -1); }
 void		Module::OnOper(User*, const std::string&) { }
 void		Module::OnPostOper(User*, const std::string&, const std::string &) { }
 void		Module::OnInfo(User*) { }
diff --git a/src/modules/extra/m_geoip.cpp b/src/modules/extra/m_geoip.cpp
index e04d5b963..d442cc16d 100644
--- a/src/modules/extra/m_geoip.cpp
+++ b/src/modules/extra/m_geoip.cpp
@@ -44,7 +44,7 @@ class ModuleGeoIP : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Provides a way to restrict users by country using GeoIP lookup", VF_VENDOR, API_VERSION);
 	}
 
 	virtual void OnRehash(User* user)
diff --git a/src/modules/extra/m_ldapauth.cpp b/src/modules/extra/m_ldapauth.cpp
index 8ffccd863..45202e6fa 100644
--- a/src/modules/extra/m_ldapauth.cpp
+++ b/src/modules/extra/m_ldapauth.cpp
@@ -224,7 +224,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Allow/Deny connections based upon answer from LDAP server", VF_VENDOR, API_VERSION);
 	}
 
 };
diff --git a/src/modules/extra/m_ldapoper.cpp b/src/modules/extra/m_ldapoper.cpp
index 46b6cbcb2..ed06d6890 100644
--- a/src/modules/extra/m_ldapoper.cpp
+++ b/src/modules/extra/m_ldapoper.cpp
@@ -179,7 +179,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Allow/Deny connections based upon answer from LDAP server", VF_VENDOR, API_VERSION);
 	}
 
 };
diff --git a/src/modules/extra/m_mssql.cpp b/src/modules/extra/m_mssql.cpp
index 1ad8a087a..f58858696 100644
--- a/src/modules/extra/m_mssql.cpp
+++ b/src/modules/extra/m_mssql.cpp
@@ -837,7 +837,7 @@ class ModuleMsSQL : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+		return Version("MsSQL provider", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
 	}
 
 };
diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index cff09d9b4..3718eecf8 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -766,7 +766,7 @@ void ModuleSQL::OnRehash(User* user)
 
 Version ModuleSQL::GetVersion()
 {
-	return Version("$Id$", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+	return Version("SQL Service Provider module for all other m_sql* modules", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
 }
 
 void DispatcherThread::Run()
diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index 520450575..c61e0983c 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -956,7 +956,7 @@ class ModulePgSQL : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
+		return Version("PostgreSQL Service Provider module for all other m_sql* modules, uses v2 of the SQL API", VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
 	}
 };
 
diff --git a/src/modules/extra/m_regex_pcre.cpp b/src/modules/extra/m_regex_pcre.cpp
index 168b1c833..5254f04a6 100644
--- a/src/modules/extra/m_regex_pcre.cpp
+++ b/src/modules/extra/m_regex_pcre.cpp
@@ -79,7 +79,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+		return Version("Regex Provider Module for PCRE", VF_COMMON | VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
 	}
 
 	virtual ~ModuleRegexPCRE()
diff --git a/src/modules/extra/m_regex_posix.cpp b/src/modules/extra/m_regex_posix.cpp
index 6cf7ec44d..34a7e9bab 100644
--- a/src/modules/extra/m_regex_posix.cpp
+++ b/src/modules/extra/m_regex_posix.cpp
@@ -86,7 +86,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+		return Version("Regex Provider Module for POSIX Regular Expressions", VF_COMMON | VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
 	}
 
 	virtual ~ModuleRegexPOSIX()
diff --git a/src/modules/extra/m_regex_tre.cpp b/src/modules/extra/m_regex_tre.cpp
index 085f15eb3..c50429a5e 100644
--- a/src/modules/extra/m_regex_tre.cpp
+++ b/src/modules/extra/m_regex_tre.cpp
@@ -85,7 +85,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+		return Version("Regex Provider Module for TRE Regular Expressions", VF_COMMON | VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
 	}
 
 	virtual ~ModuleRegexTRE()
diff --git a/src/modules/extra/m_sqlauth.cpp b/src/modules/extra/m_sqlauth.cpp
index e20f4e33e..1f2df8a1a 100644
--- a/src/modules/extra/m_sqlauth.cpp
+++ b/src/modules/extra/m_sqlauth.cpp
@@ -203,7 +203,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Allow/Deny connections based upon an arbitary SQL table", VF_VENDOR, API_VERSION);
 	}
 
 };
diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp
index ea76fbc1d..86b2cb378 100644
--- a/src/modules/extra/m_sqlite3.cpp
+++ b/src/modules/extra/m_sqlite3.cpp
@@ -747,7 +747,7 @@ class ModuleSQLite3 : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+		return Version("sqlite3 provider", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
 	}
 
 };
diff --git a/src/modules/extra/m_sqllog.cpp b/src/modules/extra/m_sqllog.cpp
index 7313556d7..556cc8b31 100644
--- a/src/modules/extra/m_sqllog.cpp
+++ b/src/modules/extra/m_sqllog.cpp
@@ -301,7 +301,7 @@ class ModuleSQLLog : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Logs network-wide data to an SQL database", VF_VENDOR, API_VERSION);
 	}
 
 };
diff --git a/src/modules/extra/m_sqloper.cpp b/src/modules/extra/m_sqloper.cpp
index 8e96a781d..3b0e6e226 100644
--- a/src/modules/extra/m_sqloper.cpp
+++ b/src/modules/extra/m_sqloper.cpp
@@ -325,7 +325,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Allows storage of oper credentials in an SQL table", VF_VENDOR, API_VERSION);
 	}
 
 };
diff --git a/src/modules/extra/m_sqlutils.cpp b/src/modules/extra/m_sqlutils.cpp
index 0acb6fe09..c257d4098 100644
--- a/src/modules/extra/m_sqlutils.cpp
+++ b/src/modules/extra/m_sqlutils.cpp
@@ -223,7 +223,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+		return Version("Provides some utilities to SQL client modules, such as mapping queries to users and channels", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
 	}
 
 };
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 27c466573..a7175005f 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -304,7 +304,7 @@ class ModuleSSLGnuTLS : public Module
 
 	Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Provides SSL support for clients", VF_VENDOR, API_VERSION);
 	}
 
 
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index e77fa23ff..8a2737f0e 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -296,7 +296,7 @@ class ModuleSSLOpenSSL : public Module
 
 	Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Provides SSL support for clients", VF_VENDOR, API_VERSION);
 	}
 
 
diff --git a/src/modules/extra/m_testclient.cpp b/src/modules/extra/m_testclient.cpp
index d643f39f1..21603c3c8 100644
--- a/src/modules/extra/m_testclient.cpp
+++ b/src/modules/extra/m_testclient.cpp
@@ -30,7 +30,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Provides SSL support for clients", VF_VENDOR, API_VERSION);
 	}
 
 	virtual void OnBackgroundTimer(time_t)
diff --git a/src/modules/extra/m_ziplink.cpp b/src/modules/extra/m_ziplink.cpp
index 7d090d80a..557ad1cfa 100644
--- a/src/modules/extra/m_ziplink.cpp
+++ b/src/modules/extra/m_ziplink.cpp
@@ -84,7 +84,7 @@ class ModuleZLib : public Module
 
 	Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Provides zlib link support for servers", VF_VENDOR, API_VERSION);
 	}
 
 
diff --git a/src/modules/m_abbreviation.cpp b/src/modules/m_abbreviation.cpp
index 9a9fabb84..8ff325730 100644
--- a/src/modules/m_abbreviation.cpp
+++ b/src/modules/m_abbreviation.cpp
@@ -30,7 +30,7 @@ class ModuleAbbreviation : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_VENDOR,API_VERSION);
+		return Version("Provides the ability to abbreviate commands a-la BBC BASIC keywords.",VF_VENDOR,API_VERSION);
 	}
 
 	virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 5140faeaf..57c6834af 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -109,7 +109,7 @@ class ModuleAlias : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR,API_VERSION);
+		return Version("Provides aliases of commands.", VF_VENDOR,API_VERSION);
 	}
 
 	std::string GetVar(std::string varname, const std::string &original_line)
diff --git a/src/modules/m_allowinvite.cpp b/src/modules/m_allowinvite.cpp
index f38da5495..ae4e0b92e 100644
--- a/src/modules/m_allowinvite.cpp
+++ b/src/modules/m_allowinvite.cpp
@@ -67,7 +67,7 @@ class ModuleAllowInvite : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Provides support for channel mode +A, allowing /invite freely on a channel (and extban A to allow specific users it)",VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_alltime.cpp b/src/modules/m_alltime.cpp
index abf3c0b1b..5a05e3339 100644
--- a/src/modules/m_alltime.cpp
+++ b/src/modules/m_alltime.cpp
@@ -61,7 +61,7 @@ class Modulealltime : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Display timestamps from all servers connected to the network", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
 };
diff --git a/src/modules/m_antibear.cpp b/src/modules/m_antibear.cpp
index 8eab13594..e429f5c56 100644
--- a/src/modules/m_antibear.cpp
+++ b/src/modules/m_antibear.cpp
@@ -33,7 +33,7 @@ class ModuleAntiBear : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_VENDOR,API_VERSION);
+		return Version("Sends a numeric on connect which cripples a common type of trojan/spambot",VF_VENDOR,API_VERSION);
 	}
 
 	virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
diff --git a/src/modules/m_antibottler.cpp b/src/modules/m_antibottler.cpp
index cae67f410..c5a56619e 100644
--- a/src/modules/m_antibottler.cpp
+++ b/src/modules/m_antibottler.cpp
@@ -34,7 +34,7 @@ class ModuleAntiBottler : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_VENDOR,API_VERSION);
+		return Version("Changes the ident of connecting bottler clients to 'bottler'",VF_VENDOR,API_VERSION);
 	}
 
 	virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp
index eab78bea9..aa1aa633a 100644
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -71,7 +71,7 @@ class ModuleAuditorium : public Module
 
 	Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Allows for auditorium channels (+u) where nobody can see others joining and parting or the nick list", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
 	void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick)
diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index be4e8d28a..0cd915ef9 100644
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -128,7 +128,7 @@ public:
 
 	Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for the +e channel mode", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
 	~ModuleBanException()
diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp
index b7eb6f1ae..dae5a775e 100644
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -333,7 +333,7 @@ class ModuleBanRedirect : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON|VF_VENDOR, API_VERSION);
+		return Version("Allows an extended ban (+b) syntax redirecting banned users to another channel", VF_COMMON|VF_VENDOR, API_VERSION);
 	}
 
 	void Prioritize()
diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index 5ce32ea8e..c9d20e3ef 100644
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -60,7 +60,7 @@ class ModuleBlockAmsg : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_VENDOR,API_VERSION);
+		return Version("Attempt to block /amsg, at least some of the irritating mIRC scripts.",VF_VENDOR,API_VERSION);
 	}
 
 	virtual void OnRehash(User* user)
diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index 135e072b1..88c09d91c 100644
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -129,7 +129,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Provides support to block all-CAPS channel messages and notices", VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 1aa2a1bd9..d0423dfe9 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -87,7 +87,7 @@ class ModuleBlockColour : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Provides support for unreal-style channel mode +c",VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index 0940a2147..f2a72781e 100644
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -44,7 +44,7 @@ class ModuleBotMode : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Provides support for unreal-style umode +B",VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
 	virtual void OnWhois(User* src, User* dst)
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 9248a5a31..a6bdb8511 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -363,7 +363,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Implementation of callerid (umode +g & /accept, ala hybrid etc)", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
 	virtual void On005Numeric(std::string& output)
diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index 0181cb2fe..2abedd975 100644
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -205,7 +205,7 @@ class ModuleCBan : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Gives /cban, aka C:lines. Think Q:lines, for channels.", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index 2c58e2ec4..af3baa292 100644
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -130,7 +130,7 @@ class ModuleCensor : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Provides user and channel +G mode",VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
 };
diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index 3dc7c627d..6cdad0958 100644
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -434,7 +434,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_VENDOR,API_VERSION);
+		return Version("Change user's hosts connecting from known CGI:IRC hosts",VF_VENDOR,API_VERSION);
 	}
 
 };
diff --git a/src/modules/m_chancreate.cpp b/src/modules/m_chancreate.cpp
index 8acddcbf4..c31cbe9cf 100644
--- a/src/modules/m_chancreate.cpp
+++ b/src/modules/m_chancreate.cpp
@@ -36,7 +36,7 @@ class ModuleChanCreate : public Module
 
 	Version GetVersion()
 	{
-		return Version("$Id$",VF_VENDOR,API_VERSION);
+		return Version("Creates a snomask with notices whenever a new channel is created",VF_VENDOR,API_VERSION);
 	}
 
 
diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index 1079505d5..7c28036b7 100644
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -139,7 +139,7 @@ class ModuleChanFilter : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides channel-specific censor lists (like mode +G but varies from channel to channel)", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
 	virtual ~ModuleChanFilter()
diff --git a/src/modules/m_chanlog.cpp b/src/modules/m_chanlog.cpp
index 8149bad1b..0e40ba80c 100644
--- a/src/modules/m_chanlog.cpp
+++ b/src/modules/m_chanlog.cpp
@@ -97,7 +97,7 @@ class ModuleChanLog : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR,API_VERSION);
+		return Version("Logs snomask output to channel(s).", VF_VENDOR,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_channames.cpp b/src/modules/m_channames.cpp
index 8b75a06a7..a918eefd2 100644
--- a/src/modules/m_channames.cpp
+++ b/src/modules/m_channames.cpp
@@ -138,7 +138,7 @@ class ModuleChannelNames : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR,API_VERSION);
+		return Version("Implements config tags which allow changing characters allowed in channel names", VF_VENDOR,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index ef3155cb6..43f6dea7c 100644
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -114,7 +114,7 @@ class ModuleChgHost : public Module
 
 	Version GetVersion()
 	{
-		return Version("$Id$", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for the CHGHOST command", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
 	}
 
 };
diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp
index b570feb46..34d969c05 100644
--- a/src/modules/m_chgident.cpp
+++ b/src/modules/m_chgident.cpp
@@ -91,7 +91,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for the CHGIDENT command", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
 	}
 
 };
diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp
index 11e7f4c9c..506325eee 100644
--- a/src/modules/m_chgname.cpp
+++ b/src/modules/m_chgname.cpp
@@ -83,7 +83,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for the CHGNAME command", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
 	}
 
 };
diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp
index fe802164d..25d997798 100644
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -339,7 +339,7 @@ class ModuleCloaking : public Module
 	{
 		// returns the version number of the module to be
 		// listed in /MODULES
-		return Version("$Id$", VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Provides masking of user hostnames", VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
 	void OnRehash(User* user)
diff --git a/src/modules/m_clones.cpp b/src/modules/m_clones.cpp
index 5a96a08a7..966f29705 100644
--- a/src/modules/m_clones.cpp
+++ b/src/modules/m_clones.cpp
@@ -72,7 +72,7 @@ class ModuleClones : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Provides the /clones command to retrieve information on clones.", VF_VENDOR, API_VERSION);
 	}
 
 
diff --git a/src/modules/m_close.cpp b/src/modules/m_close.cpp
index 009d50d46..762036407 100644
--- a/src/modules/m_close.cpp
+++ b/src/modules/m_close.cpp
@@ -80,7 +80,7 @@ class ModuleClose : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Provides /CLOSE functionality", VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_commonchans.cpp b/src/modules/m_commonchans.cpp
index 4cda89f21..35d7f5179 100644
--- a/src/modules/m_commonchans.cpp
+++ b/src/modules/m_commonchans.cpp
@@ -65,7 +65,7 @@ class ModulePrivacyMode : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON|VF_VENDOR, API_VERSION);
+		return Version("Adds user mode +c, which if set, users must be on a common channel with you to private message you", VF_COMMON|VF_VENDOR, API_VERSION);
 	}
 
 	virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
diff --git a/src/modules/m_conn_join.cpp b/src/modules/m_conn_join.cpp
index 594f1dd06..af6b50afd 100644
--- a/src/modules/m_conn_join.cpp
+++ b/src/modules/m_conn_join.cpp
@@ -72,7 +72,7 @@ class ModuleConnJoin : public Module
 
 		virtual Version GetVersion()
 		{
-			return Version("$Id$", VF_VENDOR,API_VERSION);
+			return Version("Forces users to join the specified channel(s) on connect", VF_VENDOR,API_VERSION);
 		}
 
 		virtual void OnPostConnect(User* user)
diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index f502ea57c..195321bfb 100644
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -46,7 +46,7 @@ class ModuleModesOnConnect : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR,API_VERSION);
+		return Version("Sets (and unsets) modes on users when they connect", VF_VENDOR,API_VERSION);
 	}
 
 	virtual void OnUserConnect(User* user)
diff --git a/src/modules/m_connectban.cpp b/src/modules/m_connectban.cpp
index 4d5011575..d5bb20fe3 100644
--- a/src/modules/m_connectban.cpp
+++ b/src/modules/m_connectban.cpp
@@ -38,7 +38,7 @@ class ModuleConnectBan : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR,API_VERSION);
+		return Version("Throttles the connections of any users who try connect flood", VF_VENDOR,API_VERSION);
 	}
 
 	virtual void OnRehash(User* user)
diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp
index 88f566d6d..04fe45627 100644
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -42,7 +42,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR,API_VERSION);
+		return Version("Connection throttle", VF_VENDOR,API_VERSION);
 	}
 
 	void InitConf()
diff --git a/src/modules/m_cycle.cpp b/src/modules/m_cycle.cpp
index 55548be95..6ff275689 100644
--- a/src/modules/m_cycle.cpp
+++ b/src/modules/m_cycle.cpp
@@ -92,7 +92,7 @@ class ModuleCycle : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Provides support for unreal-style CYCLE command.", VF_VENDOR, API_VERSION);
 	}
 
 };
diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index fb6847872..a25d553d1 100644
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -471,7 +471,7 @@ class ModuleDCCAllow : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Povides support for the /DCCALLOW command", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp
index bafa3adab..82da68100 100644
--- a/src/modules/m_deaf.cpp
+++ b/src/modules/m_deaf.cpp
@@ -163,7 +163,7 @@ class ModuleDeaf : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Provides support for ircu style usermode +d (deaf to channel messages and channel notices)", VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
 };
diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp
index c79fa0381..182399eaa 100644
--- a/src/modules/m_delayjoin.cpp
+++ b/src/modules/m_delayjoin.cpp
@@ -80,7 +80,7 @@ ModuleDelayJoin::~ModuleDelayJoin()
 
 Version ModuleDelayJoin::GetVersion()
 {
-	return Version("$Id$", VF_COMMON | VF_VENDOR);
+	return Version("Allows for delay-join channels (+D) where users dont appear to join until they speak", VF_COMMON | VF_VENDOR);
 }
 
 void ModuleDelayJoin::OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick)
diff --git a/src/modules/m_delaymsg.cpp b/src/modules/m_delaymsg.cpp
index 1673d05ba..9acfc57ea 100644
--- a/src/modules/m_delaymsg.cpp
+++ b/src/modules/m_delaymsg.cpp
@@ -101,7 +101,7 @@ ModuleDelayMsg::~ModuleDelayMsg()
 
 Version ModuleDelayMsg::GetVersion()
 {
-	return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+	return Version("Provides channelmode +d <int>, to deny messages to a channel until <int> seconds.", VF_COMMON | VF_VENDOR, API_VERSION);
 }
 
 void ModuleDelayMsg::OnUserJoin(Membership* memb, bool sync, bool created, CUList&)
diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp
index 401642e08..f47d414bd 100644
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -82,7 +82,7 @@ class ModuleDenyChannels : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR,API_VERSION);
+		return Version("Implements config tags which allow blocking of joins to channels", VF_VENDOR,API_VERSION);
 	}
 
 
diff --git a/src/modules/m_devoice.cpp b/src/modules/m_devoice.cpp
index edc2140e8..2e590095f 100644
--- a/src/modules/m_devoice.cpp
+++ b/src/modules/m_devoice.cpp
@@ -65,7 +65,7 @@ class ModuleDeVoice : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Provides voiced users with the ability to devoice themselves.", VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp
index 8ce1ce37c..06709979b 100644
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -229,7 +229,7 @@ class ModuleDNSBL : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Provides handling of DNS blacklists", VF_VENDOR, API_VERSION);
 	}
 
 
diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 35b72d24c..0c020513f 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -477,7 +477,7 @@ void FilterBase::OnLoadModule(Module* mod, const std::string& name)
 
 Version FilterBase::GetVersion()
 {
-	return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
+	return Version("Text (spam) filtering", VF_VENDOR | VF_COMMON, API_VERSION);
 }
 
 
diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index 229a79b97..19359a976 100644
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -156,7 +156,7 @@ class ModuleGlobalLoad : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Allows global loading of a module.", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index 3798828a7..81d969979 100644
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -66,7 +66,7 @@ class ModuleGlobops : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for GLOBOPS and user mode +g", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
 };
diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index 2ff22d4d3..f16c64e82 100644
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -184,7 +184,7 @@ class ModuleHelpop : public Module
 
 		virtual Version GetVersion()
 		{
-			return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+			return Version("/helpop Command, Works like Unreal helpop", VF_COMMON | VF_VENDOR, API_VERSION);
 		}
 };
 
diff --git a/src/modules/m_hidechans.cpp b/src/modules/m_hidechans.cpp
index 14f77ce17..6c3dba88f 100644
--- a/src/modules/m_hidechans.cpp
+++ b/src/modules/m_hidechans.cpp
@@ -66,7 +66,7 @@ class ModuleHideChans : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for hiding channels with user mode +I", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
 	virtual void OnRehash(User* user)
diff --git a/src/modules/m_hideoper.cpp b/src/modules/m_hideoper.cpp
index 178fc8bc5..8294f5390 100644
--- a/src/modules/m_hideoper.cpp
+++ b/src/modules/m_hideoper.cpp
@@ -70,7 +70,7 @@ class ModuleHideOper : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for hiding oper status with user mode +H", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
 	ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
diff --git a/src/modules/m_hostchange.cpp b/src/modules/m_hostchange.cpp
index a35b2fd5d..a89b5949d 100644
--- a/src/modules/m_hostchange.cpp
+++ b/src/modules/m_hostchange.cpp
@@ -89,7 +89,7 @@ class ModuleHostChange : public Module
 	{
 		// returns the version number of the module to be
 		// listed in /MODULES
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Provides masking of user hostnames in a different way to m_cloaking", VF_VENDOR, API_VERSION);
 	}
 
 	virtual void OnUserConnect(User* user)
diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index c1698accf..929697c5f 100644
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -424,7 +424,7 @@ class ModuleHttpServer : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+		return Version("Provides HTTP serving facilities to modules", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_httpd_acl.cpp b/src/modules/m_httpd_acl.cpp
index ceb329471..812ea843f 100644
--- a/src/modules/m_httpd_acl.cpp
+++ b/src/modules/m_httpd_acl.cpp
@@ -284,7 +284,7 @@ class ModuleHTTPAccessList : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Provides access control lists (passwording of resources, ip restrictions etc) to m_httpd.so dependent modules", VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_httpd_config.cpp b/src/modules/m_httpd_config.cpp
index f68bc471f..5f902eb29 100644
--- a/src/modules/m_httpd_config.cpp
+++ b/src/modules/m_httpd_config.cpp
@@ -121,7 +121,7 @@ class ModuleHttpStats : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Provides statistics over HTTP via m_httpd.so", VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index 3222903dc..884793e1c 100644
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -194,7 +194,7 @@ class ModuleHttpStats : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Provides statistics over HTTP via m_httpd.so", VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index e5c8940ec..973c93f72 100644
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -299,7 +299,7 @@ class ModuleIdent : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Provides support for RFC1413 ident lookups", VF_VENDOR, API_VERSION);
 	}
 
 	virtual void OnRehash(User *user)
diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index a7ae0c431..e2a68120b 100644
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -101,7 +101,7 @@ public:
 
 	Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
+		return Version("Provides support for the +I channel mode", VF_VENDOR | VF_COMMON, API_VERSION);
 	}
 
 	~ModuleInviteException()
diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index c53a6d1c4..854276500 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -249,7 +249,7 @@ class ModuleJoinFlood : public Module
 
 	Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides channel mode +j (join flood protection)", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index 6dd8de99a..78d4bf4b8 100644
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.cpp
@@ -161,7 +161,7 @@ class ModuleJumpServer : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Provides support for the RPL_REDIR numeric", VF_VENDOR, API_VERSION);
 	}
 
 };
diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 46350d59d..e2f9310d6 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -101,7 +101,7 @@ class ModuleKnock : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for /KNOCK and mode +K", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp
index 7fa9d4c10..6844fc953 100644
--- a/src/modules/m_lockserv.cpp
+++ b/src/modules/m_lockserv.cpp
@@ -110,7 +110,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Allows locking of the server to stop all incoming connections till unlocked again", VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_maphide.cpp b/src/modules/m_maphide.cpp
index 73f217ec2..9a46df1d4 100644
--- a/src/modules/m_maphide.cpp
+++ b/src/modules/m_maphide.cpp
@@ -50,7 +50,7 @@ class ModuleMapHide : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Hide /MAP and /LINKS in the same form as ircu (mostly useless)", VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_md5.cpp b/src/modules/m_md5.cpp
index 15356edca..2771ba495 100644
--- a/src/modules/m_md5.cpp
+++ b/src/modules/m_md5.cpp
@@ -310,7 +310,7 @@ class ModuleMD5 : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION);
+		return Version("Allows for MD5 encrypted oper passwords",VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index bd586bcba..611ff953f 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -269,7 +269,7 @@ class ModuleMsgFlood : public Module
 
 	Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides channel mode +f (message flood protection)", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_muteban.cpp b/src/modules/m_muteban.cpp
index d1ba487a6..6040252c1 100644
--- a/src/modules/m_muteban.cpp
+++ b/src/modules/m_muteban.cpp
@@ -31,7 +31,7 @@ class ModuleQuietBan : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Implements extban +b m: - mute bans",VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
 	virtual ModResult OnUserPreMessage(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index 8c9c4e0c4..6f954df64 100644
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -33,7 +33,7 @@ class ModuleNamesX : public Module
 
 	Version GetVersion()
 	{
-		return Version("$Id$",VF_VENDOR);
+		return Version("Provides the NAMESX (CAP multi-prefix) capability.",VF_VENDOR);
 	}
 
 	void On005Numeric(std::string &output)
diff --git a/src/modules/m_nationalchars.cpp b/src/modules/m_nationalchars.cpp
index f27b54a52..2fe8dcf39 100755
--- a/src/modules/m_nationalchars.cpp
+++ b/src/modules/m_nationalchars.cpp
@@ -288,7 +288,7 @@ class ModuleNationalChars : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_COMMON,API_VERSION);
+		return Version("Provides an ability to have non-RFC1459 nicks & support for national CASEMAPPING",VF_COMMON,API_VERSION);
 	}
 
 	/*make an array to check against it 8bit characters a bit faster. Whether allowed or uppercase (for your needs).*/
diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index c10b9c798..7e1309457 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -166,7 +166,7 @@ class ModuleNickLock : public Module
 
 	Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides the NICKLOCK command, allows an oper to chage a users nick and lock them to it until they quit", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
 
diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index df3db0e12..eaadb59fe 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -66,7 +66,7 @@ class ModuleNoCTCP : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for unreal-style channel mode +C", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
 	virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index 1324a7c03..b060d87f8 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -66,7 +66,7 @@ class ModuleNoKicks : public Module
 
 	Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for unreal-style channel mode +Q", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 70ecfdae0..456d83580 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -61,7 +61,7 @@ class ModuleNoNickChange : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for channel mode +N & extban +b N: which prevents nick changes on channel", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
 
diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index fab52ca2e..e5a3f9996 100644
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -74,7 +74,7 @@ class ModuleNoNotice : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for unreal-style channel mode +T", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_nopartmsg.cpp b/src/modules/m_nopartmsg.cpp
index 1ea275167..32500f069 100644
--- a/src/modules/m_nopartmsg.cpp
+++ b/src/modules/m_nopartmsg.cpp
@@ -31,7 +31,7 @@ class ModulePartMsgBan : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON|VF_VENDOR, API_VERSION);
+		return Version("Implements extban +b p: - part message bans", VF_COMMON|VF_VENDOR, API_VERSION);
 	}
 
 
diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index 32d54bce7..1dbc61f90 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -74,7 +74,7 @@ class ModuleOperChans : public Module
 
 	Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
+		return Version("Provides support for oper-only chans via the +O channel mode", VF_VENDOR | VF_COMMON, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index 7b0295846..6b94a4ef9 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -82,7 +82,7 @@ class ModuleOperjoin : public Module
 
 		virtual Version GetVersion()
 		{
-			return Version("$Id$", VF_VENDOR, API_VERSION);
+			return Version("Forces opers to join the specified channel(s) on oper-up", VF_VENDOR, API_VERSION);
 		}
 
 		virtual void OnPostOper(User* user, const std::string &opertype, const std::string &opername)
diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index b613c1e31..979ce8654 100644
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -41,7 +41,7 @@ class ModuleOperLevels : public Module
 
 		virtual Version GetVersion()
 		{
-			return Version("$Id$", VF_VENDOR, API_VERSION);
+			return Version("Gives each oper type a 'level', cannot kill opers 'above' your level.", VF_VENDOR, API_VERSION);
 		}
 
 		virtual ModResult OnKill(User* source, User* dest, const std::string &reason)
diff --git a/src/modules/m_operlog.cpp b/src/modules/m_operlog.cpp
index 646aada3e..fb89b162f 100644
--- a/src/modules/m_operlog.cpp
+++ b/src/modules/m_operlog.cpp
@@ -33,7 +33,7 @@ class ModuleOperLog : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("A module which logs all oper commands to the ircd log at default loglevel.", VF_VENDOR, API_VERSION);
 	}
 
 
diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index 1efefe753..5b78e431b 100644
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -46,7 +46,7 @@ class ModuleModesOnOper : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Sets (and unsets) modes on opers when they oper up", VF_VENDOR, API_VERSION);
 	}
 
 	virtual void OnPostOper(User* user, const std::string &opertype, const std::string &opername)
diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index 87e8874e3..418c36b0c 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -93,7 +93,7 @@ class ModuleOpermotd : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Shows a message to opers after oper-up, adds /opermotd", VF_VENDOR, API_VERSION);
 	}
 
 
diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp
index 7bf3a3623..732d58857 100644
--- a/src/modules/m_operprefix.cpp
+++ b/src/modules/m_operprefix.cpp
@@ -135,7 +135,7 @@ class ModuleOperPrefixMode : public Module
 
 	Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Gives opers cmode +y which provides a staff prefix.", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index 1f2eb876a..92f0f8efc 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -224,7 +224,7 @@ class ModuleOverride : public Module
 
 	Version GetVersion()
 	{
-		return Version("$Id$",VF_VENDOR,API_VERSION);
+		return Version("Provides support for unreal-style oper-override",VF_VENDOR,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_password_hash.cpp b/src/modules/m_password_hash.cpp
index 61bc742c2..1617110d1 100644
--- a/src/modules/m_password_hash.cpp
+++ b/src/modules/m_password_hash.cpp
@@ -157,7 +157,7 @@ class ModuleOperHash : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_VENDOR,API_VERSION);
+		return Version("Allows for hashed oper passwords",VF_VENDOR,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp
index a0b2adea2..60d2ec248 100644
--- a/src/modules/m_permchannels.cpp
+++ b/src/modules/m_permchannels.cpp
@@ -293,7 +293,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Provides support for channel mode +P to provide permanent channels",VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
 	virtual ModResult OnChannelPreDelete(Channel *c)
diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index 3b8214865..c3a9c514f 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -97,7 +97,7 @@ class ModuleRandQuote : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_VENDOR,API_VERSION);
+		return Version("Provides random Quotes on Connect.",VF_VENDOR,API_VERSION);
 	}
 
 	virtual void OnUserConnect(User* user)
diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index 00fae3c53..13468823e 100644
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -135,7 +135,7 @@ class ModuleRedirect : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides channel mode +L (limit redirection)", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_regex_glob.cpp b/src/modules/m_regex_glob.cpp
index 97d36c4b9..8d7eaafc3 100644
--- a/src/modules/m_regex_glob.cpp
+++ b/src/modules/m_regex_glob.cpp
@@ -46,7 +46,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+		return Version("Regex module using plain wildcard matching.", VF_COMMON | VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
 	}
 
 	virtual ~ModuleRegexGlob()
diff --git a/src/modules/m_regonlycreate.cpp b/src/modules/m_regonlycreate.cpp
index c3ecef202..546d8235a 100644
--- a/src/modules/m_regonlycreate.cpp
+++ b/src/modules/m_regonlycreate.cpp
@@ -50,7 +50,7 @@ class ModuleRegOnlyCreate : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Prevents users who's nicks are not registered from creating new channels", VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index d8fc89ccd..09f60ad19 100644
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -214,7 +214,7 @@ class ModuleRemove : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides a /remove command, this is mostly an alternative to /kick, except makes users appear to have parted the channel", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
 	}
 
 };
diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp
index 68aa455e7..8e60359f6 100644
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -76,7 +76,7 @@ class ModuleRestrictChans : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_VENDOR,API_VERSION);
+		return Version("Only opers may create new channels if this module is loaded",VF_VENDOR,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_restrictmsg.cpp b/src/modules/m_restrictmsg.cpp
index 906184e7a..affcd5a24 100644
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -63,7 +63,7 @@ class ModuleRestrictMsg : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_VENDOR,API_VERSION);
+		return Version("Forbids users from messaging each other. Users may still message opers and opers may message other opers.",VF_VENDOR,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_ripemd160.cpp b/src/modules/m_ripemd160.cpp
index 963c45f18..87ca21ada 100644
--- a/src/modules/m_ripemd160.cpp
+++ b/src/modules/m_ripemd160.cpp
@@ -494,7 +494,7 @@ class ModuleRIPEMD160 : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
+		return Version("Allows for RIPEMD-160 encrypted oper passwords", VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
 	}
 
 };
diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp
index bfcff98b9..94f17ab8c 100644
--- a/src/modules/m_rline.cpp
+++ b/src/modules/m_rline.cpp
@@ -227,7 +227,7 @@ class ModuleRLine : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("RLINE: Regexp user banning.", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
 	virtual void OnUserConnect(User* user)
diff --git a/src/modules/m_rpc_json.cpp b/src/modules/m_rpc_json.cpp
index 425b33e0e..76b5f0e2e 100644
--- a/src/modules/m_rpc_json.cpp
+++ b/src/modules/m_rpc_json.cpp
@@ -56,7 +56,7 @@ class ModuleRpcJson : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_SERVICEPROVIDER | VF_VENDOR, API_VERSION);
+		return Version("Encode and decode JSON-RPC requests for modules", VF_SERVICEPROVIDER | VF_VENDOR, API_VERSION);
 	}
 
 
diff --git a/src/modules/m_rpctest.cpp b/src/modules/m_rpctest.cpp
index e4ee0770a..146eabacf 100644
--- a/src/modules/m_rpctest.cpp
+++ b/src/modules/m_rpctest.cpp
@@ -34,7 +34,7 @@ class ModuleRPCTest : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("A test of the RPC API", VF_VENDOR, API_VERSION);
 	}
 
 
diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp
index 127b5f304..325972d76 100644
--- a/src/modules/m_safelist.cpp
+++ b/src/modules/m_safelist.cpp
@@ -64,7 +64,7 @@ class ModuleSafeList : public Module
 
 	Version GetVersion()
 	{
-		return Version("$Id$",VF_VENDOR,API_VERSION);
+		return Version("A module overriding /list, and making it safe - stop those sendq problems.",VF_VENDOR,API_VERSION);
 	}
 
 
diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index bf1cbe450..207415d9e 100644
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -109,7 +109,7 @@ class ModuleSajoin : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for unreal-style SAJOIN command", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
 	}
 
 };
diff --git a/src/modules/m_sakick.cpp b/src/modules/m_sakick.cpp
index d8eda0956..cd0b07477 100644
--- a/src/modules/m_sakick.cpp
+++ b/src/modules/m_sakick.cpp
@@ -109,7 +109,7 @@ class ModuleSakick : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_OPTCOMMON|VF_VENDOR, API_VERSION);
+		return Version("Provides a SAKICK command", VF_OPTCOMMON|VF_VENDOR, API_VERSION);
 	}
 
 };
diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 92894f5b8..1053f74d2 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -55,7 +55,7 @@ class ModuleSaMode : public Module
 
 	Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Provides more advanced UnrealIRCd SAMODE command", VF_VENDOR, API_VERSION);
 	}
 
 	ModResult OnPreMode(User* source,User* dest,Channel* channel, const std::vector<std::string>& parameters)
diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index 82d1fd3a5..cd3c0aff8 100644
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -98,7 +98,7 @@ class ModuleSanick : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for SANICK command", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
 	}
 
 };
diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 576ec6e7b..d4d4c58ec 100644
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -109,7 +109,7 @@ class ModuleSapart : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for unreal-style SAPART command", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
 	}
 
 };
diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp
index ee49b37ef..4d67a2cd1 100644
--- a/src/modules/m_saquit.cpp
+++ b/src/modules/m_saquit.cpp
@@ -78,7 +78,7 @@ class ModuleSaquit : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for an SAQUIT command, exits user with a reason", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
 	}
 
 };
diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index 8a4d772cc..696b3d809 100644
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -255,7 +255,7 @@ class ModuleSASL : public Module
 
 	Version GetVersion()
 	{
-		return Version("$Id$",VF_VENDOR,API_VERSION);
+		return Version("Provides support for IRC Authentication Layer (aka: atheme SASL) via AUTHENTICATE.",VF_VENDOR,API_VERSION);
 	}
 
 	void OnEvent(Event *ev)
diff --git a/src/modules/m_satopic.cpp b/src/modules/m_satopic.cpp
index 3a68a98d8..58d9cac94 100644
--- a/src/modules/m_satopic.cpp
+++ b/src/modules/m_satopic.cpp
@@ -67,7 +67,7 @@ class ModuleSATopic : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Provides a SATOPIC command", VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp
index 6da7ab7aa..b2d1f8014 100644
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -34,7 +34,7 @@ class ModuleSecureList : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_VENDOR,API_VERSION);
+		return Version("A module overriding /list, and making it safe - stop those sendq problems.",VF_VENDOR,API_VERSION);
 	}
 
 	void OnRehash(User* user)
diff --git a/src/modules/m_seenicks.cpp b/src/modules/m_seenicks.cpp
index 6ef5ad0c3..630a7e58e 100644
--- a/src/modules/m_seenicks.cpp
+++ b/src/modules/m_seenicks.cpp
@@ -35,7 +35,7 @@ class ModuleSeeNicks : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Provides support for seeing local and remote nickchanges via snomasks", VF_VENDOR, API_VERSION);
 	}
 
 
diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index dea382452..7480daf07 100644
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -283,7 +283,7 @@ class ModuleServicesAccount : public Module
 
 	Version GetVersion()
 	{
-		return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Povides support for ircu-style services accounts, including chmode +R, etc.",VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp
index f9661c3ea..ee6f2ad23 100644
--- a/src/modules/m_servprotect.cpp
+++ b/src/modules/m_servprotect.cpp
@@ -57,7 +57,7 @@ class ModuleServProtectMode : public Module
 
 	Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for Austhex style +k / UnrealIRCD +S services mode", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
 	void OnWhois(User* src, User* dst)
diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index af9443efd..ffbc66ddc 100644
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -95,7 +95,7 @@ class ModuleSetHost : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Provides support for the SETHOST command", VF_VENDOR, API_VERSION);
 	}
 
 };
diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp
index 26d4254b8..3b6f6682b 100644
--- a/src/modules/m_setident.cpp
+++ b/src/modules/m_setident.cpp
@@ -70,7 +70,7 @@ class ModuleSetIdent : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Provides support for the SETIDENT command", VF_VENDOR, API_VERSION);
 	}
 
 };
diff --git a/src/modules/m_setidle.cpp b/src/modules/m_setidle.cpp
index d5d397321..68df49a33 100644
--- a/src/modules/m_setidle.cpp
+++ b/src/modules/m_setidle.cpp
@@ -62,7 +62,7 @@ class ModuleSetIdle : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Allows opers to set their idle time", VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp
index 49b0741f0..be5bdb5f9 100644
--- a/src/modules/m_setname.cpp
+++ b/src/modules/m_setname.cpp
@@ -67,7 +67,7 @@ class ModuleSetName : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Provides support for the SETNAME command", VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_sha256.cpp b/src/modules/m_sha256.cpp
index 3ad1ca1f8..b6dc215db 100644
--- a/src/modules/m_sha256.cpp
+++ b/src/modules/m_sha256.cpp
@@ -302,7 +302,7 @@ class ModuleSHA256 : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
+		return Version("Allows for SHA-256 encrypted oper passwords", VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index e42e5fa36..63e02c76d 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -103,7 +103,7 @@ class ModuleShowwhois : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Allows opers to set +W to see when a user uses WHOIS on them",VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
 	virtual void OnWhois(User* source, User* dest)
diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index c3cd3a80d..746dcb918 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -294,7 +294,7 @@ class ModuleShun : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_VENDOR|VF_COMMON,API_VERSION);
+		return Version("Provides the /shun command, which stops a user executing all commands except PING and PONG.",VF_VENDOR|VF_COMMON,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index be1477a16..57f3416e7 100644
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -368,7 +368,7 @@ class ModuleSilence : public Module
 
 	Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for the /SILENCE command", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_spanningtree/modules.cpp b/src/modules/m_spanningtree/modules.cpp
index 7a20a98ff..635fac7d3 100644
--- a/src/modules/m_spanningtree/modules.cpp
+++ b/src/modules/m_spanningtree/modules.cpp
@@ -51,17 +51,17 @@ bool TreeSocket::Modules(const std::string &prefix, parameterlist &params)
 
 		if (IS_OPER(source))
 		{
-                        std::string flags("Svsc");
+			std::string flags("SvscC");
 			int pos = 0;
-			for (int mult = 1; mult <= VF_SERVICEPROVIDER; mult *= 2, ++pos)
+			for (int mult = 1; mult <= VF_OPTCOMMON; mult *= 2, ++pos)
 				if (!(V.Flags & mult))
 					flags[pos] = '-';
 
-			snprintf(strbuf, MAXBUF, "::%s 702 %s :0x%08lx %s %s :%s", ServerInstance->Config->ServerName, source->nick.c_str(),(unsigned long)m, module_names[i].c_str(), flags.c_str(), V.version.c_str());
+			snprintf(strbuf, MAXBUF, "::%s 702 %s :0x%08lx %s %s :%s - %s", ServerInstance->Config->ServerName, source->nick.c_str(),(unsigned long)m, module_names[i].c_str(), flags.c_str(), V.description.c_str(), V.version.c_str());
 		}
 		else
 		{
-			snprintf(strbuf, MAXBUF, "::%s 702 %s :%s", ServerInstance->Config->ServerName, source->nick.c_str(), module_names[i].c_str());
+			snprintf(strbuf, MAXBUF, "::%s 702 %s :%s %s", ServerInstance->Config->ServerName, source->nick.c_str(), module_names[i].c_str(), V.description.c_str());
 		}
 		par[1] = strbuf;
 		Utils->DoOneToOne(ServerInstance->Config->GetSID(), "PUSH", par, source->server);
diff --git a/src/modules/m_spy.cpp b/src/modules/m_spy.cpp
index e964cb766..0cc660537 100644
--- a/src/modules/m_spy.cpp
+++ b/src/modules/m_spy.cpp
@@ -45,7 +45,7 @@ class ModuleSpy : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Provides the ability to see the complete names list of channels an oper is not a member of", VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index 27a9285cc..52e506f07 100644
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -125,7 +125,7 @@ class ModuleSSLModes : public Module
 
 	Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for unreal-style channel mode +z", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp
index fa5dd17c7..34db0c9e5 100644
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -138,7 +138,7 @@ class ModuleStripColor : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides channel +S mode (strip ansi colour)", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
 };
diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index e75f1d150..e99adcaec 100644
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -202,7 +202,7 @@ class ModuleSVSHold : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Implements SVSHOLD. Like Q:Lines, but can only be added/removed by Services.", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index 272a73758..0c84764a2 100644
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -146,7 +146,7 @@ class ModuleSWhois : public Module
 
 	Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides the SWHOIS command which allows setting of arbitary WHOIS lines", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index c4f8feafe..7bbeb13a6 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -187,7 +187,7 @@ class ModuleTimedBans : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Adds timed bans", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_tline.cpp b/src/modules/m_tline.cpp
index 2d44a049a..d3c8641d1 100644
--- a/src/modules/m_tline.cpp
+++ b/src/modules/m_tline.cpp
@@ -76,7 +76,7 @@ class ModuleTLine : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR,API_VERSION);
+		return Version("Provides /tline command used to test who a mask matches", VF_VENDOR,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_uhnames.cpp b/src/modules/m_uhnames.cpp
index 126c41038..f9cd4c596 100644
--- a/src/modules/m_uhnames.cpp
+++ b/src/modules/m_uhnames.cpp
@@ -33,7 +33,7 @@ class ModuleUHNames : public Module
 
 	Version GetVersion()
 	{
-		return Version("$Id$",VF_VENDOR,API_VERSION);
+		return Version("Provides the UHNAMES facility.",VF_VENDOR,API_VERSION);
 	}
 
 	void On005Numeric(std::string &output)
diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index 495ec0511..38b344f5a 100644
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -98,7 +98,7 @@ class ModuleUninvite : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
+		return Version("Provides the UNINVITE command which lets users un-invite other users from channels (!)", VF_VENDOR | VF_COMMON, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index ff4da2828..14a92e068 100644
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -77,7 +77,7 @@ class ModuleUserIP : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_VENDOR,API_VERSION);
+		return Version("Provides support for USERIP command",VF_VENDOR,API_VERSION);
 	}
 
 };
diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp
index dcba12874..72b5d669c 100644
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -72,7 +72,7 @@ class ModuleVHost : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_VENDOR,API_VERSION);
+		return Version("Provides masking of user hostnames via traditional /VHOST command",VF_VENDOR,API_VERSION);
 	}
 
 };
diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index 92e4116ec..8c237a8eb 100644
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -528,7 +528,7 @@ class Modulewatch : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for the /WATCH command", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp
index 56bf7c8ef..efd6a9c1d 100644
--- a/src/modules/m_xline_db.cpp
+++ b/src/modules/m_xline_db.cpp
@@ -240,7 +240,7 @@ class ModuleXLineDB : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Keeps a dynamic log of all XLines created, and stores them in a seperate conf file (xline.db).", VF_VENDOR, API_VERSION);
 	}
 };