Some more text fixes and improvements (#1618).

71 files changed, 91 insertions, 88 deletions

diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
index 997a3c411..913da6a2b 100644
--- a/docs/conf/modules.conf.example
+++ b/docs/conf/modules.conf.example
@@ -453,10 +453,12 @@
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # Channelban: Implements extended ban j:, which stops anyone already
-# in a channel matching a ban like +b j:#channel*mask from joining.
+# in a channel matching a ban like +b j:#channel from joining.
+# It is also possible to ban based on their status in that channel,
+# like so: +b j:@#channel, this example prevents the ops from joining.
 # Note that by default wildcard characters * and ? are allowed in
-# channel names. To disallow them, load m_channames and add characters
-# 42 and 63 to denyrange (see above).
+# channel names. To disallow them, load the channames module and
+# add characters 42 and 63 to denyrange (see above).
 #<module name="channelban">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
@@ -501,7 +503,7 @@
 # Connection class ban module: Adds support for extban 'n' which
 # matches against the class name of the user's connection.
 # This module assumes that connection classes are named in a uniform
-# way on all servers of the network.
+# way on all servers of the network. Wildcards are accepted.
 #<module name="classban">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
@@ -1445,7 +1447,7 @@
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # Network business join module:
 # Allows an oper to join a channel using /OJOIN, giving them +Y on the
-# channel which makes them immune to kick/deop/etc.
+# channel which makes them immune to kicks.
 #<module name="ojoin">
 #
 # Specify the prefix that +Y will grant here.
@@ -1979,6 +1981,7 @@
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # Serverban: Implements extended ban 's', which stops anyone connected
 # to a server matching a mask like +b s:server.mask.here from joining.
+# Wildcards are accepted.
 #<module name="serverban">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
diff --git a/src/coremods/core_message.cpp b/src/coremods/core_message.cpp
index 65eaa1bb7..a17157bad 100644
--- a/src/coremods/core_message.cpp
+++ b/src/coremods/core_message.cpp
@@ -164,7 +164,7 @@ class CommandMessage : public Command
 			if (no_chan_priv && chan->IsModeSet(moderatedmode))
 			{
 				// The moderated mode is set and the source has no status rank.
-				source->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, "Cannot send to channel (+m)");
+				source->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, "Cannot send to channel (+m is set)");
 				return CMD_FAILURE;
 			}
 
diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp
index 4558e087a..e81e99025 100644
--- a/src/modules/extra/m_sqlite3.cpp
+++ b/src/modules/extra/m_sqlite3.cpp
@@ -264,7 +264,7 @@ class ModuleSQLite3 : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("sqlite3 provider", VF_VENDOR);
+		return Version("Provides SQLite3 support", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 1e5554f98..ce1dbaeaf 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -1387,7 +1387,7 @@ class ModuleSSLGnuTLS : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides SSL support for clients", VF_VENDOR);
+		return Version("Provides SSL support via GnuTLS", VF_VENDOR);
 	}
 
 	ModResult OnCheckReady(LocalUser* user) CXX11_OVERRIDE
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index 5f61c71a9..3ebc8e4d9 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -1063,7 +1063,7 @@ class ModuleSSLOpenSSL : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides SSL support for clients", VF_VENDOR);
+		return Version("Provides SSL support via OpenSSL", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_allowinvite.cpp b/src/modules/m_allowinvite.cpp
index 330feccb7..45e54d2cc 100644
--- a/src/modules/m_allowinvite.cpp
+++ b/src/modules/m_allowinvite.cpp
@@ -57,7 +57,7 @@ class ModuleAllowInvite : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for channel mode +A, allowing /INVITE freely on a channel, and extban A to deny specific users it", VF_VENDOR);
+		return Version("Provides channel mode +A to allow /INVITE freely on a channel, and extban 'A' to deny specific users it", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_alltime.cpp b/src/modules/m_alltime.cpp
index 486ad1c18..a7ff2bd07 100644
--- a/src/modules/m_alltime.cpp
+++ b/src/modules/m_alltime.cpp
@@ -58,7 +58,7 @@ class Modulealltime : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Display timestamps from all servers connected to the network", VF_OPTCOMMON | VF_VENDOR);
+		return Version("Provides the ALLTIME command, displays timestamps from all servers connected to the network", VF_OPTCOMMON | VF_VENDOR);
 	}
 
 };
diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp
index 6f47c5743..f708ea9d0 100644
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -89,7 +89,7 @@ class ModuleAuditorium
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Allows for auditorium channels (+u) where nobody can see others joining and parting or the nick list", VF_VENDOR);
+		return Version("Provides channel mode +u, auditorium channels where nobody can see others joining and parting or the nick list", VF_VENDOR);
 	}
 
 	/* Can they be seen by everyone? */
diff --git a/src/modules/m_autoop.cpp b/src/modules/m_autoop.cpp
index ffad7e0f1..83c405338 100644
--- a/src/modules/m_autoop.cpp
+++ b/src/modules/m_autoop.cpp
@@ -112,7 +112,7 @@ class ModuleAutoOp : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for the +w channel mode", VF_VENDOR);
+		return Version("Provides channel mode +w, basic channel access controls", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index d9ceeaab1..c7864ea9e 100644
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -107,7 +107,7 @@ class ModuleBanException : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for the +e channel mode", VF_VENDOR);
+		return Version("Provides channel mode +e, ban exceptions", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 273d1204e..25345506e 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -58,7 +58,7 @@ class ModuleBlockColor : public Module
 					// Block all control codes except \001 for CTCP
 					if ((*i >= 0) && (*i < 32) && (*i != 1))
 					{
-						user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, "Can't send colors to channel (+c set)");
+						user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, "Can't send colors to channel (+c is set)");
 						return MOD_RES_DENY;
 					}
 				}
diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index 31309ed2f..a97cc8fcc 100644
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -122,7 +122,7 @@ class ModuleCensor : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides user and channel +G mode",VF_VENDOR);
+		return Version("Provides user and channel mode +G", VF_VENDOR);
 	}
 
 };
diff --git a/src/modules/m_chancreate.cpp b/src/modules/m_chancreate.cpp
index 6cf4af235..4f9e4e803 100644
--- a/src/modules/m_chancreate.cpp
+++ b/src/modules/m_chancreate.cpp
@@ -31,7 +31,7 @@ class ModuleChanCreate : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides snomasks 'j' and 'J', to which notices about newly created channels are sent",VF_VENDOR);
+		return Version("Provides snomasks 'j' and 'J', to which notices about newly created channels are sent", VF_VENDOR);
 	}
 
 	void OnUserJoin(Membership* memb, bool sync, bool created, CUList& except) CXX11_OVERRIDE
diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp
index 1057e63b6..540fa2908 100644
--- a/src/modules/m_chanhistory.cpp
+++ b/src/modules/m_chanhistory.cpp
@@ -207,7 +207,7 @@ class ModuleChanHistory
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides channel history replayed on join", VF_VENDOR);
+		return Version("Provides channel mode +H, allows for the channel message history to be replayed on join", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_channelban.cpp b/src/modules/m_channelban.cpp
index ffb43eef1..c34e0a6c5 100644
--- a/src/modules/m_channelban.cpp
+++ b/src/modules/m_channelban.cpp
@@ -25,7 +25,7 @@ class ModuleBadChannelExtban : public Module
  public:
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Extban 'j' - channel status/join ban", VF_OPTCOMMON|VF_VENDOR);
+		return Version("Provides extban 'j', ban users that are present in another channel, and optionally on their status there", VF_OPTCOMMON|VF_VENDOR);
 	}
 
 	ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) CXX11_OVERRIDE
diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index 6447ef9e3..d6c17a37e 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -322,7 +322,7 @@ class ModuleCheck : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("CHECK command, view user, channel, IP address or hostname information", VF_VENDOR|VF_OPTCOMMON);
+		return Version("Provides the CHECK command to view user, channel, IP address or hostname information", VF_VENDOR|VF_OPTCOMMON);
 	}
 };
 
diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index af6e09aaf..0ca7dc78c 100644
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -103,7 +103,7 @@ class ModuleChgHost : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for the CHGHOST command", VF_OPTCOMMON | VF_VENDOR);
+		return Version("Provides the CHGHOST command", VF_OPTCOMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp
index 6ddda7ea1..a2f6836fa 100644
--- a/src/modules/m_chgident.cpp
+++ b/src/modules/m_chgident.cpp
@@ -85,7 +85,7 @@ public:
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for the CHGIDENT command", VF_OPTCOMMON | VF_VENDOR);
+		return Version("Provides the CHGIDENT command", VF_OPTCOMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp
index 108c988cc..bcbf22a14 100644
--- a/src/modules/m_chgname.cpp
+++ b/src/modules/m_chgname.cpp
@@ -81,7 +81,7 @@ public:
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for the CHGNAME command", VF_OPTCOMMON | VF_VENDOR);
+		return Version("Provides the CHGNAME command", VF_OPTCOMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_classban.cpp b/src/modules/m_classban.cpp
index 066834079..c8fb422b3 100644
--- a/src/modules/m_classban.cpp
+++ b/src/modules/m_classban.cpp
@@ -40,7 +40,7 @@ class ModuleClassBan : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Class 'n' - Connection class ban", VF_VENDOR | VF_OPTCOMMON);
+		return Version("Provides extban 'n', connection class bans", VF_VENDOR | VF_OPTCOMMON);
 	}
 };
 
diff --git a/src/modules/m_commonchans.cpp b/src/modules/m_commonchans.cpp
index 80fd75e7b..f3c206a44 100644
--- a/src/modules/m_commonchans.cpp
+++ b/src/modules/m_commonchans.cpp
@@ -40,7 +40,7 @@ class ModuleCommonChans
 		if (user->HasPrivPermission("users/ignore-commonchans") || user->server->IsULine())
 			return MOD_RES_PASSTHRU;
 
-		user->WriteNumeric(ERR_CANTSENDTOUSER, targuser->nick, "You are not permitted to send private messages to this user (+c set)");
+		user->WriteNumeric(ERR_CANTSENDTOUSER, targuser->nick, "You are not permitted to send private messages to this user (+c is set)");
 		return MOD_RES_DENY;
 	}
 
@@ -53,7 +53,7 @@ class ModuleCommonChans
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Adds user mode +c which requires users to share a common channel with you to private message you", VF_VENDOR);
+		return Version("Provides user mode +c, requires users to share a common channel with you to private message you", VF_VENDOR);
 	}
 
 	ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp
index ec8211914..3ffc9f682 100644
--- a/src/modules/m_customtitle.cpp
+++ b/src/modules/m_customtitle.cpp
@@ -160,7 +160,7 @@ class ModuleCustomTitle : public Module, public Whois::LineEventListener
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Custom title for users", VF_OPTCOMMON | VF_VENDOR);
+		return Version("Provides the TITLE command, custom titles for users", VF_OPTCOMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index 00b57bcba..e0ea4c7ae 100644
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -529,7 +529,7 @@ class ModuleDCCAllow : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for the DCCALLOW command", VF_COMMON | VF_VENDOR);
+		return Version("Provides the DCCALLOW command", VF_COMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp
index 7db60fa64..acfbfce26 100644
--- a/src/modules/m_delayjoin.cpp
+++ b/src/modules/m_delayjoin.cpp
@@ -127,7 +127,7 @@ ModeAction DelayJoinMode::OnModeChange(User* source, User* dest, Channel* channe
 
 Version ModuleDelayJoin::GetVersion()
 {
-	return Version("Allows for delay-join channels (channel mode +D) where users don't appear to join until they speak", VF_VENDOR);
+	return Version("Provides channel mode +D, delay-join, users don't appear as joined to others until they speak", VF_VENDOR);
 }
 
 ModResult ModuleDelayJoin::OnNamesListItem(LocalUser* issuer, Membership* memb, std::string& prefixes, std::string& nick)
diff --git a/src/modules/m_delaymsg.cpp b/src/modules/m_delaymsg.cpp
index ed37477d8..6acaa9a2f 100644
--- a/src/modules/m_delaymsg.cpp
+++ b/src/modules/m_delaymsg.cpp
@@ -137,7 +137,7 @@ ModResult ModuleDelayMsg::HandleMessage(User* user, const MessageTarget& target,
 	{
 		if (channel->GetPrefixValue(user) < VOICE_VALUE)
 		{
-			user->WriteNumeric(ERR_CANNOTSENDTOCHAN, channel->name, InspIRCd::Format("You must wait %d seconds after joining to send to the channel (+d)", len));
+			user->WriteNumeric(ERR_CANNOTSENDTOCHAN, channel->name, InspIRCd::Format("You must wait %d seconds after joining to send to the channel (+d is set)", len));
 			return MOD_RES_DENY;
 		}
 	}
diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 49553545c..b2febf810 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -629,7 +629,7 @@ void ModuleFilter::ReadConfig(ConfigStatus& status)
 
 Version ModuleFilter::GetVersion()
 {
-	return Version("Text (spam) filtering", VF_VENDOR | VF_COMMON, RegexEngine ? RegexEngine->name : "");
+	return Version("Provides text (spam) filtering", VF_VENDOR | VF_COMMON, RegexEngine ? RegexEngine->name : "");
 }
 
 std::string ModuleFilter::EncodeFilter(FilterResult* filter)
diff --git a/src/modules/m_flashpolicyd.cpp b/src/modules/m_flashpolicyd.cpp
index db0eeb1f1..923c0cbff 100644
--- a/src/modules/m_flashpolicyd.cpp
+++ b/src/modules/m_flashpolicyd.cpp
@@ -155,7 +155,7 @@ class ModuleFlashPD : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Flash Policy Daemon. Allows Flash IRC clients to connect", VF_VENDOR);
+		return Version("Flash Policy Daemon, allows Flash IRC clients to connect", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index 0102b3b57..e70645161 100644
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -53,7 +53,7 @@ class ModuleGlobops : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for GLOBOPS and snomask +g", VF_VENDOR);
+		return Version("Provides the GLOBOPS command and snomask 'g'", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index 3f9459d19..b12c98b5d 100644
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -91,7 +91,7 @@ public:
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for the +I channel mode", VF_VENDOR);
+		return Version("Provides channel mode +I, invite exceptions", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_ircv3_ctctags.cpp b/src/modules/m_ircv3_ctctags.cpp
index 5a88e68a0..6052051b9 100644
--- a/src/modules/m_ircv3_ctctags.cpp
+++ b/src/modules/m_ircv3_ctctags.cpp
@@ -83,7 +83,7 @@ class CommandTagMsg : public Command
 			if (no_chan_priv && chan->IsModeSet(moderatedmode))
 			{
 				// The moderated mode is set and the source has no status rank.
-				source->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, "Cannot send to channel (+m)");
+				source->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, "Cannot send to channel (+m is set)");
 				return CMD_FAILURE;
 			}
 
diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index cc62eb13b..1b9deac5f 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -151,7 +151,7 @@ class ModuleJoinFlood : public Module
 			joinfloodsettings *f = jf.ext.get(chan);
 			if (f && f->islocked())
 			{
-				user->WriteNumeric(ERR_UNAVAILRESOURCE, chan->name, "This channel is temporarily unavailable (+j). Please try again later.");
+				user->WriteNumeric(ERR_UNAVAILRESOURCE, chan->name, "This channel is temporarily unavailable (+j is set). Please try again later.");
 				return MOD_RES_DENY;
 			}
 		}
@@ -181,7 +181,7 @@ class ModuleJoinFlood : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides channel mode +j (join flood protection)", VF_VENDOR);
+		return Version("Provides channel mode +j, join flood protection", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index 70f3578b2..ec5ac661e 100644
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -145,7 +145,7 @@ public:
 			const KickRejoinData* data = kr.ext.get(chan);
 			if ((data) && !invapi->IsInvited(user, chan) && (!data->canjoin(user)))
 			{
-				user->WriteNumeric(ERR_UNAVAILRESOURCE, chan, InspIRCd::Format("You must wait %u seconds after being kicked to rejoin (+J)", data->delay));
+				user->WriteNumeric(ERR_UNAVAILRESOURCE, chan, InspIRCd::Format("You must wait %u seconds after being kicked to rejoin (+J is set)", data->delay));
 				return MOD_RES_DENY;
 			}
 		}
@@ -166,7 +166,7 @@ public:
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Channel mode to delay rejoin after kick", VF_VENDOR | VF_COMMON, kr.GetModuleSettings());
+		return Version("Provides channel mode +J, delays rejoins after kicks", VF_VENDOR | VF_COMMON, kr.GetModuleSettings());
 	}
 };
 
diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp
index 2db01b99a..5d049423d 100644
--- a/src/modules/m_lockserv.cpp
+++ b/src/modules/m_lockserv.cpp
@@ -123,7 +123,7 @@ class ModuleLockserv : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Allows locking of the server to stop all incoming connections until unlocked again", VF_VENDOR);
+		return Version("Provides the LOCKSERV and UNLOCKSERV commands to lock the server and block all incoming connections until unlocked again", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_maphide.cpp b/src/modules/m_maphide.cpp
index 5298a8d04..8228c56c3 100644
--- a/src/modules/m_maphide.cpp
+++ b/src/modules/m_maphide.cpp
@@ -41,7 +41,7 @@ class ModuleMapHide : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Replaces the output of /MAP and /LINKS with an URL", VF_VENDOR);
+		return Version("Replaces the output of the MAP and LINKS commands with an URL", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index b2c67d538..3021b1771 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -179,7 +179,7 @@ private:
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides channel mode +f (message flood protection)", VF_VENDOR);
+		return Version("Provides channel mode +f, message flood protection", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_muteban.cpp b/src/modules/m_muteban.cpp
index 10b23187d..acfcb1801 100644
--- a/src/modules/m_muteban.cpp
+++ b/src/modules/m_muteban.cpp
@@ -42,7 +42,7 @@ class ModuleQuietBan
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Implements extban +b m: - mute bans",VF_OPTCOMMON|VF_VENDOR);
+		return Version("Provides extban 'm', mute bans", VF_OPTCOMMON|VF_VENDOR);
 	}
 
 	ModResult HandleMessage(User* user, const MessageTarget& target, bool& echo_original)
diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index 13b132eb3..c73f8308e 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -73,7 +73,7 @@ class ModuleNoCTCP : public Module
 
 			if (!c->GetExtBanStatus(user, 'C').check(!c->IsModeSet(nc)))
 			{
-				user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, "Can't send CTCP to channel (+C set)");
+				user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, "Can't send CTCP to channel (+C is set)");
 				return MOD_RES_DENY;
 			}
 		}
@@ -85,7 +85,7 @@ class ModuleNoCTCP : public Module
 			User* u = target.Get<User>();
 			if (u->IsModeSet(ncu))
 			{
-				user->WriteNumeric(ERR_CANTSENDTOUSER, u->nick, "Can't send CTCP to user (+T set)");
+				user->WriteNumeric(ERR_CANTSENDTOUSER, u->nick, "Can't send CTCP to user (+T is set)");
 				return MOD_RES_DENY;
 			}
 		}
diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index 8a87f7df8..6cd91c55b 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -42,7 +42,7 @@ class ModuleNoKicks : public Module
 		if (!memb->chan->GetExtBanStatus(source, 'Q').check(!memb->chan->IsModeSet(nk)))
 		{
 			// Can't kick with Q in place, not even opers with override, and founders
-			source->WriteNumeric(ERR_CHANOPRIVSNEEDED, memb->chan->name, InspIRCd::Format("Can't kick user %s from channel (+Q set)", memb->user->nick.c_str()));
+			source->WriteNumeric(ERR_CHANOPRIVSNEEDED, memb->chan->name, InspIRCd::Format("Can't kick user %s from channel (+Q is set)", memb->user->nick.c_str()));
 			return MOD_RES_DENY;
 		}
 		return MOD_RES_PASSTHRU;
diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 998662c3c..a796495a8 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -35,7 +35,7 @@ class ModuleNoNickChange : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for channel mode +N & extban +b N: which prevents nick changes on channel", VF_VENDOR);
+		return Version("Provides channel mode +N and extban 'N' which prevents nick changes on the channel", VF_VENDOR);
 	}
 
 	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index 77b0c9aa3..730b02716 100644
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -52,7 +52,7 @@ class ModuleNoNotice : public Module
 					return MOD_RES_PASSTHRU;
 				else
 				{
-					user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, "Can't send NOTICE to channel (+T set)");
+					user->WriteNumeric(ERR_CANNOTSENDTOCHAN, c->name, "Can't send NOTICE to channel (+T is set)");
 					return MOD_RES_DENY;
 				}
 			}
diff --git a/src/modules/m_nopartmsg.cpp b/src/modules/m_nopartmsg.cpp
index 7aeb66920..224722695 100644
--- a/src/modules/m_nopartmsg.cpp
+++ b/src/modules/m_nopartmsg.cpp
@@ -24,7 +24,7 @@ class ModulePartMsgBan : public Module
  public:
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Implements extban +b p: - part message bans", VF_OPTCOMMON|VF_VENDOR);
+		return Version("Provides extban 'p', part message bans", VF_OPTCOMMON|VF_VENDOR);
 	}
 
 	void OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts) CXX11_OVERRIDE
diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp
index 67b79e07c..c0626ec69 100644
--- a/src/modules/m_ojoin.cpp
+++ b/src/modules/m_ojoin.cpp
@@ -157,7 +157,7 @@ class ModuleOjoin : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Network Business Join", VF_VENDOR);
+		return Version("Provides the OJOIN command, allows an oper to join a channel and be immune to kicks", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index e423acb0c..8484d7dcc 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -73,7 +73,7 @@ class ModuleOperChans : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for oper-only chans via the +O channel mode and 'O' extban", VF_VENDOR);
+		return Version("Provides support for oper-only channels via channel mode +O and extban 'O'", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp
index dc250e0d8..766158a21 100644
--- a/src/modules/m_permchannels.cpp
+++ b/src/modules/m_permchannels.cpp
@@ -305,7 +305,7 @@ public:
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for channel mode +P to provide permanent channels",VF_VENDOR);
+		return Version("Provides channel mode +P to provide permanent channels", VF_VENDOR);
 	}
 
 	ModResult OnChannelPreDelete(Channel *c) CXX11_OVERRIDE
diff --git a/src/modules/m_regex_glob.cpp b/src/modules/m_regex_glob.cpp
index dea079803..f4dccac20 100644
--- a/src/modules/m_regex_glob.cpp
+++ b/src/modules/m_regex_glob.cpp
@@ -56,7 +56,7 @@ public:
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Regex module using plain wildcard matching", VF_VENDOR);
+		return Version("Regex provider module using plain wildcard matching", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index e23914246..850864be2 100644
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -149,7 +149,7 @@ class RemoveBase : public Command
 		else
 		{
 			/* m_nokicks.so was loaded and +Q was set, block! */
-			user->WriteNumeric(ERR_RESTRICTED, channel->name, InspIRCd::Format("Can't remove user %s from channel (nokicks mode is set)", target->nick.c_str()));
+			user->WriteNumeric(ERR_RESTRICTED, channel->name, InspIRCd::Format("Can't remove user %s from channel (+Q is set)", target->nick.c_str()));
 			return CMD_FAILURE;
 		}
 
diff --git a/src/modules/m_repeat.cpp b/src/modules/m_repeat.cpp
index 89df1814c..609fd9d60 100644
--- a/src/modules/m_repeat.cpp
+++ b/src/modules/m_repeat.cpp
@@ -412,7 +412,7 @@ class RepeatModule : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides the +E channel mode - for blocking of similar messages", VF_COMMON|VF_VENDOR, rm.GetModuleSettings());
+		return Version("Provides channel mode +E, blocking of similar messages", VF_COMMON|VF_VENDOR, rm.GetModuleSettings());
 	}
 };
 
diff --git a/src/modules/m_restrictmsg.cpp b/src/modules/m_restrictmsg.cpp
index 531c17029..75d3d905c 100644
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -68,7 +68,7 @@ class ModuleRestrictMsg
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Forbids users from messaging each other. Users may still message opers and opers may message other opers", VF_VENDOR);
+		return Version("Forbids users from messaging each other, but users may still message opers and opers may message other opers", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index d01339133..39ebb28cc 100644
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -96,7 +96,7 @@ class CommandSajoin : public Command
 		}
 		else
 		{
-			user->WriteNotice("*** No such nickname "+nickname);
+			user->WriteNotice("*** No such nickname: '" + nickname + "'");
 			return CMD_FAILURE;
 		}
 	}
@@ -118,7 +118,7 @@ class ModuleSajoin : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides command SAJOIN to allow opers to force-join users to channels", VF_OPTCOMMON | VF_VENDOR);
+		return Version("Provides the SAJOIN command, allows opers to force-join users to channels", VF_OPTCOMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_sakick.cpp b/src/modules/m_sakick.cpp
index 2970596af..a323ed85c 100644
--- a/src/modules/m_sakick.cpp
+++ b/src/modules/m_sakick.cpp
@@ -90,7 +90,7 @@ class ModuleSakick : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides a SAKICK command", VF_OPTCOMMON|VF_VENDOR);
+		return Version("Provides the SAKICK command", VF_OPTCOMMON|VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 61d676d6a..b1642e470 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -96,7 +96,7 @@ class ModuleSaMode : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides command SAMODE to allow opers to change modes on channels and users", VF_VENDOR);
+		return Version("Provides the SAMODE command, allows opers to change modes on channels and users", VF_VENDOR);
 	}
 
 	ModResult OnPreMode(User* source, User* dest, Channel* channel, Modes::ChangeList& modes) CXX11_OVERRIDE
diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index e814e2c4e..11dc50ddc 100644
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -54,7 +54,7 @@ class CommandSanick : public Command
 
 			if (!ServerInstance->IsNick(parameters[1]))
 			{
-				user->WriteNotice("*** Invalid nickname '" + parameters[1] + "'");
+				user->WriteNotice("*** Invalid nickname: '" + parameters[1] + "'");
 				return CMD_FAILURE;
 			}
 		}
@@ -95,7 +95,7 @@ class ModuleSanick : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for SANICK command", VF_OPTCOMMON | VF_VENDOR);
+		return Version("Provides the SANICK command, allows opers to change the nicknames of users", VF_OPTCOMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 4753ef16f..9fb6b3de5 100644
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -96,7 +96,7 @@ class ModuleSapart : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides the SAPART command to force-part users from a channel", VF_OPTCOMMON | VF_VENDOR);
+		return Version("Provides the SAPART command, allows opers to force-part users from channels", VF_OPTCOMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp
index 648528876..ad3c857e0 100644
--- a/src/modules/m_saquit.cpp
+++ b/src/modules/m_saquit.cpp
@@ -54,7 +54,7 @@ class CommandSaquit : public Command
 		}
 		else
 		{
-			user->WriteNotice("*** Invalid nickname '" + parameters[0] + "'");
+			user->WriteNotice("*** Invalid nickname: '" + parameters[0] + "'");
 			return CMD_FAILURE;
 		}
 	}
@@ -76,7 +76,7 @@ class ModuleSaquit : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for an SAQUIT command, exits user with a reason", VF_OPTCOMMON | VF_VENDOR);
+		return Version("Provides the SAQUIT command, allows opers to force-quit users", VF_OPTCOMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_satopic.cpp b/src/modules/m_satopic.cpp
index b3aec8592..dc1e95488 100644
--- a/src/modules/m_satopic.cpp
+++ b/src/modules/m_satopic.cpp
@@ -69,7 +69,7 @@ class ModuleSATopic : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides a SATOPIC command", VF_VENDOR);
+		return Version("Provides the SATOPIC command", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp
index 6d9b64df2..e74134a3a 100644
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -33,7 +33,7 @@ class ModuleSecureList : public Module
  public:
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Disallows /LIST for recently connected clients to hinder spam bots", VF_VENDOR);
+		return Version("Disallows the LIST command for recently connected clients to hinder spam bots", VF_VENDOR);
 	}
 
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
diff --git a/src/modules/m_seenicks.cpp b/src/modules/m_seenicks.cpp
index bff3516f1..557223948 100644
--- a/src/modules/m_seenicks.cpp
+++ b/src/modules/m_seenicks.cpp
@@ -31,7 +31,7 @@ class ModuleSeeNicks : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for seeing local and remote nickchanges via snomasks", VF_VENDOR);
+		return Version("Provides snomasks 'n' and 'N' to see local and remote nickchanges", VF_VENDOR);
 	}
 
 	void OnUserPostNick(User* user, const std::string &oldnick) CXX11_OVERRIDE
diff --git a/src/modules/m_serverban.cpp b/src/modules/m_serverban.cpp
index f51d1d373..bd512f58b 100644
--- a/src/modules/m_serverban.cpp
+++ b/src/modules/m_serverban.cpp
@@ -24,7 +24,7 @@ class ModuleServerBan : public Module
  public:
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Extban 's' - server ban",VF_OPTCOMMON|VF_VENDOR);
+		return Version("Provides extban 's' to ban users connected to a specified server", VF_OPTCOMMON|VF_VENDOR);
 	}
 
 	ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) CXX11_OVERRIDE
diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index bb8514add..dad849153 100644
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -84,7 +84,7 @@ class ModuleSetHost : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for the SETHOST command", VF_VENDOR);
+		return Version("Provides the SETHOST command", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp
index 79e168332..04b5c97c8 100644
--- a/src/modules/m_setident.cpp
+++ b/src/modules/m_setident.cpp
@@ -65,7 +65,7 @@ class ModuleSetIdent : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for the SETIDENT command", VF_VENDOR);
+		return Version("Provides the SETIDENT command", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_setidle.cpp b/src/modules/m_setidle.cpp
index 8bca7000b..eaae08249 100644
--- a/src/modules/m_setidle.cpp
+++ b/src/modules/m_setidle.cpp
@@ -69,7 +69,7 @@ class ModuleSetIdle : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Allows opers to set their idle time", VF_VENDOR);
+		return Version("Provides the SETIDLE command, allows opers to set their idle time", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp
index b0e76f587..846938c8d 100644
--- a/src/modules/m_setname.cpp
+++ b/src/modules/m_setname.cpp
@@ -76,7 +76,7 @@ class ModuleSetName : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for the SETNAME command", VF_VENDOR);
+		return Version("Provides the SETNAME command", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 70c149273..8532b14eb 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -95,7 +95,7 @@ class ModuleShowwhois : public Module, public Whois::EventListener
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Allows opers to set +W to see when a user uses WHOIS on them",VF_OPTCOMMON|VF_VENDOR);
+		return Version("Provides user mode +W for opers to see when a user uses WHOIS on them", VF_OPTCOMMON|VF_VENDOR);
 	}
 
 	void OnWhois(Whois::Context& whois) CXX11_OVERRIDE
diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index 3b32097ea..01f99ce7e 100644
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -201,7 +201,7 @@ class CommandSilence : public SplitCommand
 		SilenceList* list = ext.get(user);
 		if (list && list->size() > maxsilence)
 		{
-			user->WriteNumeric(ERR_SILELISTFULL, mask, SilenceEntry::BitsToFlags(flags), "Your silence list is full");
+			user->WriteNumeric(ERR_SILELISTFULL, mask, SilenceEntry::BitsToFlags(flags), "Your SILENCE list is full");
 			return CMD_FAILURE;
 		}
 		else if (!list)
@@ -213,7 +213,7 @@ class CommandSilence : public SplitCommand
 
 		if (!list->insert(SilenceEntry(flags, mask)).second)
 		{
-			user->WriteNumeric(ERR_SILENCE, mask, SilenceEntry::BitsToFlags(flags), "The silence entry you specified already exists");
+			user->WriteNumeric(ERR_SILENCE, mask, SilenceEntry::BitsToFlags(flags), "The SILENCE entry you specified already exists");
 			return CMD_FAILURE;
 		}
 
@@ -239,7 +239,7 @@ class CommandSilence : public SplitCommand
 			}
 		}
 
-		user->WriteNumeric(ERR_SILENCE, mask, SilenceEntry::BitsToFlags(flags), "The silence entry you specified could not be found");
+		user->WriteNumeric(ERR_SILENCE, mask, SilenceEntry::BitsToFlags(flags), "The SILENCE entry you specified could not be found");
 		return CMD_FAILURE;
 	}
 
@@ -253,7 +253,7 @@ class CommandSilence : public SplitCommand
 				user->WriteNumeric(RPL_SILELIST, iter->mask, SilenceEntry::BitsToFlags(iter->flags));
 			}
 		}
-		user->WriteNumeric(RPL_ENDOFSILELIST, "End of silence list");
+		user->WriteNumeric(RPL_ENDOFSILELIST, "End of SILENCE list");
 		return CMD_SUCCESS;
 	}
 
@@ -431,7 +431,7 @@ class ModuleSilence
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for blocking users with the /SILENCE command", VF_OPTCOMMON | VF_VENDOR);
+		return Version("Provides support for blocking users with the SILENCE command", VF_OPTCOMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index 1ff93b7ad..67128e6bd 100644
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -159,13 +159,13 @@ class ModuleSSLModes
 		{
 			if (!api)
 			{
-				user->WriteNumeric(ERR_SECUREONLYCHAN, cname, "Cannot join channel; unable to determine if you are an SSL user (+z)");
+				user->WriteNumeric(ERR_SECUREONLYCHAN, cname, "Cannot join channel; unable to determine if you are an SSL user (+z is set)");
 				return MOD_RES_DENY;
 			}
 
 			if (!api->GetCertificate(user))
 			{
-				user->WriteNumeric(ERR_SECUREONLYCHAN, cname, "Cannot join channel; SSL users only (+z)");
+				user->WriteNumeric(ERR_SECUREONLYCHAN, cname, "Cannot join channel; SSL users only (+z is set)");
 				return MOD_RES_DENY;
 			}
 		}
@@ -190,7 +190,7 @@ class ModuleSSLModes
 			if (!api || !api->GetCertificate(user))
 			{
 				/* The sending user is not on an SSL connection */
-				user->WriteNumeric(ERR_CANTSENDTOUSER, target->nick, "You are not permitted to send private messages to this user (+z set)");
+				user->WriteNumeric(ERR_CANTSENDTOUSER, target->nick, "You are not permitted to send private messages to this user (+z is set)");
 				return MOD_RES_DENY;
 			}
 		}
diff --git a/src/modules/m_starttls.cpp b/src/modules/m_starttls.cpp
index ea6536ed1..881ef490b 100644
--- a/src/modules/m_starttls.cpp
+++ b/src/modules/m_starttls.cpp
@@ -104,7 +104,7 @@ class ModuleStartTLS : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for the STARTTLS command", VF_VENDOR);
+		return Version("Provides the STARTTLS command", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp
index 4634cfaff..6ea279422 100644
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -90,7 +90,7 @@ class ModuleStripColor : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides channel mode +S (strip ansi color)", VF_VENDOR);
+		return Version("Provides channel mode +S, strip ansi color", VF_VENDOR);
 	}
 
 };
diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index 83488a954..a17d31116 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -234,7 +234,7 @@ class ModuleTimedBans : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Adds timed bans", VF_COMMON | VF_VENDOR);
+		return Version("Provides the TBAN command, timed channel bans", VF_COMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_uhnames.cpp b/src/modules/m_uhnames.cpp
index 7f9975a55..420ba2c84 100644
--- a/src/modules/m_uhnames.cpp
+++ b/src/modules/m_uhnames.cpp
@@ -39,7 +39,7 @@ class ModuleUHNames
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides the UHNAMES facility", VF_VENDOR);
+		return Version("Provides the UHNAMES (CAP userhost-in-names) capability", VF_VENDOR);
 	}
 
 	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index 54b2808b9..f6589acff 100644
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -92,7 +92,7 @@ class ModuleUserIP : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for USERIP command",VF_VENDOR);
+		return Version("Provides the USERIP command", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp
index 478a5100a..ae126c89e 100644
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -116,7 +116,7 @@ class ModuleVHost : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides masking of user hostnames via traditional /VHOST command", VF_VENDOR);
+		return Version("Provides masking of user hostnames via the VHOST command", VF_VENDOR);
 	}
 };