Textual improvements and fixes such as typos, casing, etc. (#1612)

71 files changed, 124 insertions, 124 deletions

diff --git a/src/modules/extra/m_ldap.cpp b/src/modules/extra/m_ldap.cpp
index 8c2752dbf..65b6b2b00 100644
--- a/src/modules/extra/m_ldap.cpp
+++ b/src/modules/extra/m_ldap.cpp
@@ -617,7 +617,7 @@ class ModuleLDAP : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("LDAP support", VF_VENDOR);
+		return Version("Provides LDAP support", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index 7c6729603..4f727519f 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -500,7 +500,7 @@ void ModuleSQL::OnUnloadModule(Module* mod)
 
 Version ModuleSQL::GetVersion()
 {
-	return Version("MySQL support", VF_VENDOR);
+	return Version("Provides MySQL support", VF_VENDOR);
 }
 
 void DispatcherThread::Run()
diff --git a/src/modules/extra/m_regex_stdlib.cpp b/src/modules/extra/m_regex_stdlib.cpp
index 42e5c8bf1..14796c22f 100644
--- a/src/modules/extra/m_regex_stdlib.cpp
+++ b/src/modules/extra/m_regex_stdlib.cpp
@@ -87,7 +87,7 @@ public:
 		else
 		{
 			if (!stdalgo::string::equalsci(regextype, "ecmascript"))
-				ServerInstance->SNO->WriteToSnoMask('a', "WARNING: Non-existent regex engine '%s' specified. Falling back to ECMAScript.", regextype.c_str());
+				ServerInstance->SNO->WriteToSnoMask('a', "WARNING: Nonexistent regex engine '%s' specified. Falling back to ECMAScript.", regextype.c_str());
 			ref.regextype = std::regex::ECMAScript;
 		}
 	}
diff --git a/src/modules/m_abbreviation.cpp b/src/modules/m_abbreviation.cpp
index f5065c73f..963dd5f16 100644
--- a/src/modules/m_abbreviation.cpp
+++ b/src/modules/m_abbreviation.cpp
@@ -35,7 +35,7 @@ class ModuleAbbreviation : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides the ability to abbreviate commands a-la BBC BASIC keywords.",VF_VENDOR);
+		return Version("Provides the ability to abbreviate commands a-la BBC BASIC keywords", VF_VENDOR);
 	}
 
 	ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE
diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 3e00db765..f6aa5bd02 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -113,7 +113,7 @@ class ModuleAlias : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides aliases of commands.", VF_VENDOR);
+		return Version("Provides aliases of commands", VF_VENDOR);
 	}
 
 	std::string GetVar(std::string varname, const std::string &original_line)
@@ -282,8 +282,8 @@ class ModuleAlias : public Module
 
 			if ((a->ULineOnly) && (!u->server->IsULine()))
 			{
-				ServerInstance->SNO->WriteToSnoMask('a', "NOTICE -- Service "+a->RequiredNick+" required by alias "+a->AliasedCommand+" is not on a u-lined server, possibly underhanded antics detected!");
-				user->WriteNumeric(ERR_NOSUCHNICK, a->RequiredNick, "is an imposter! Please inform an IRC operator as soon as possible.");
+				ServerInstance->SNO->WriteToSnoMask('a', "NOTICE -- Service "+a->RequiredNick+" required by alias "+a->AliasedCommand+" is not on a U-lined server, possibly underhanded antics detected!");
+				user->WriteNumeric(ERR_NOSUCHNICK, a->RequiredNick, "is an imposter! Please inform a server operator as soon as possible.");
 				return 1;
 			}
 		}
diff --git a/src/modules/m_allowinvite.cpp b/src/modules/m_allowinvite.cpp
index 41edbc855..330feccb7 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 support for channel mode +A, allowing /INVITE freely on a channel, and extban A to deny specific users it", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_anticaps.cpp b/src/modules/m_anticaps.cpp
index e916edd53..463ff809b 100644
--- a/src/modules/m_anticaps.cpp
+++ b/src/modules/m_anticaps.cpp
@@ -297,7 +297,7 @@ class ModuleAntiCaps : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for punishing users that send capitalised messages.", VF_COMMON|VF_VENDOR);
+		return Version("Provides support for punishing users that send capitalised messages", VF_COMMON|VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp
index 7246527d3..752aedd90 100644
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -325,13 +325,13 @@ class ModuleBanRedirect : public Module
 
 						if(destchan && destchan->IsModeSet(redirectmode) && !destlimit.empty() && (destchan->GetUserCounter() >= ConvToNum<size_t>(destlimit)))
 						{
-							user->WriteNumeric(ERR_BANNEDFROMCHAN, chan->name, "Cannot join channel (You are banned)");
+							user->WriteNumeric(ERR_BANNEDFROMCHAN, chan->name, "Cannot join channel (you're banned)");
 							return MOD_RES_DENY;
 						}
 						else
 						{
-							user->WriteNumeric(ERR_BANNEDFROMCHAN, chan->name, "Cannot join channel (You are banned)");
-							user->WriteNumeric(470, chan->name, redir->targetchan, "You are banned from this channel, so you are automatically transferred to the redirected channel.");
+							user->WriteNumeric(ERR_BANNEDFROMCHAN, chan->name, "Cannot join channel (you're banned)");
+							user->WriteNumeric(470, chan->name, redir->targetchan, "You are banned from this channel, so you are automatically being transferred to the redirected channel.");
 							nofollow = true;
 							Channel::JoinUser(user, redir->targetchan);
 							nofollow = false;
diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index c4af2fd7f..5ab627c71 100644
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -60,7 +60,7 @@ class ModuleBlockAmsg : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Attempt to block /amsg, at least some of the irritating mIRC scripts.",VF_VENDOR);
+		return Version("Attempt to block /amsg or /ame, at least some of the irritating client scripts", VF_VENDOR);
 	}
 
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
@@ -120,12 +120,12 @@ class ModuleBlockAmsg : public Module
 			{
 				// Block it...
 				if (action == IBLOCK_KILLOPERS || action == IBLOCK_NOTICEOPERS)
-					ServerInstance->SNO->WriteToSnoMask('a', "%s had an /amsg or /ame denied", user->nick.c_str());
+					ServerInstance->SNO->WriteToSnoMask('a', "%s had an /amsg or /ame blocked", user->nick.c_str());
 
 				if (action == IBLOCK_KILL || action == IBLOCK_KILLOPERS)
 					ServerInstance->Users->QuitUser(user, "Attempted to global message (/amsg or /ame)");
 				else if (action == IBLOCK_NOTICE || action == IBLOCK_NOTICEOPERS)
-					user->WriteNotice("Global message (/amsg or /ame) denied");
+					user->WriteNotice("Global message (/amsg or /ame) blocked");
 
 				return MOD_RES_DENY;
 			}
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index f2cf112bf..a13d4d613 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -392,7 +392,7 @@ public:
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Implementation of callerid, usermode +g, /accept", VF_COMMON | VF_VENDOR);
+		return Version("Implementation of callerid, provides user mode +g and the ACCEPT command", VF_COMMON | VF_VENDOR);
 	}
 
 	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
@@ -422,7 +422,7 @@ public:
 			if (now > (dat->lastnotify + (time_t)notify_cooldown))
 			{
 				user->WriteNumeric(RPL_TARGNOTIFY, dest->nick, "has been informed that you messaged them.");
-				dest->WriteRemoteNumeric(RPL_UMODEGMSG, user->nick, InspIRCd::Format("%s@%s", user->ident.c_str(), user->GetDisplayedHost().c_str()), InspIRCd::Format("is messaging you, and you have umode +g. Use /ACCEPT +%s to allow.",
+				dest->WriteRemoteNumeric(RPL_UMODEGMSG, user->nick, InspIRCd::Format("%s@%s", user->ident.c_str(), user->GetDisplayedHost().c_str()), InspIRCd::Format("is messaging you, and you have user mode +g set. Use /ACCEPT +%s to allow.",
 						user->nick.c_str()));
 				dat->lastnotify = now;
 			}
diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index 32b45abfb..62fb993af 100644
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -106,7 +106,7 @@ class CommandCBan : public Command
 			}
 			else
 			{
-				user->WriteNotice("*** CBan " + parameters[0] + " not found in list, try /stats C.");
+				user->WriteNotice("*** CBan " + parameters[0] + " not found on the list.");
 				return CMD_FAILURE;
 			}
 		}
@@ -204,7 +204,7 @@ class ModuleCBan : public Module, public Stats::EventListener
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Gives /cban, aka C-lines. Think Q-lines, for channels.", VF_COMMON | VF_VENDOR);
+		return Version("Provides the CBAN command, like Q-lines, but for channels", VF_COMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_chanlog.cpp b/src/modules/m_chanlog.cpp
index afe213f61..64b79a39e 100644
--- a/src/modules/m_chanlog.cpp
+++ b/src/modules/m_chanlog.cpp
@@ -62,7 +62,7 @@ class ModuleChanLog : public Module
 		if (itpair.first == itpair.second)
 			return MOD_RES_PASSTHRU;
 
-		const std::string snotice = "\2" + desc + "\2: " + msg;
+		const std::string snotice = "\002" + desc + "\002: " + msg;
 
 		for (ChanLogTargets::const_iterator it = itpair.first; it != itpair.second; ++it)
 		{
@@ -80,7 +80,7 @@ class ModuleChanLog : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Logs snomask output to channel(s).", VF_VENDOR);
+		return Version("Logs snomask output to channel(s)", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_clearchan.cpp b/src/modules/m_clearchan.cpp
index 096ce6022..859da46a4 100644
--- a/src/modules/m_clearchan.cpp
+++ b/src/modules/m_clearchan.cpp
@@ -211,7 +211,7 @@ class ModuleClearChan : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Adds /CLEARCHAN that allows opers to masskick, masskill or mass G/Z-line users on a channel.", VF_VENDOR|VF_OPTCOMMON);
+		return Version("Provides the CLEARCHAN command that allows opers to masskick, masskill or mass G/Z-line users on a channel", VF_VENDOR|VF_OPTCOMMON);
 	}
 };
 
diff --git a/src/modules/m_clones.cpp b/src/modules/m_clones.cpp
index 06956c564..1a3a5fd7b 100644
--- a/src/modules/m_clones.cpp
+++ b/src/modules/m_clones.cpp
@@ -96,7 +96,7 @@ class ModuleClones : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides the /CLONES command to retrieve information on clones.", VF_VENDOR);
+		return Version("Provides the CLONES command to retrieve information on clones", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_connectban.cpp b/src/modules/m_connectban.cpp
index b3cabd18a..9ce583063 100644
--- a/src/modules/m_connectban.cpp
+++ b/src/modules/m_connectban.cpp
@@ -33,7 +33,7 @@ class ModuleConnectBan : public Module
  public:
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Throttles the connections of IP ranges who try to connect flood.", VF_VENDOR);
+		return Version("Throttles the connections of IP ranges who try to connect flood", VF_VENDOR);
 	}
 
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
diff --git a/src/modules/m_customprefix.cpp b/src/modules/m_customprefix.cpp
index befc9750d..831aa908d 100644
--- a/src/modules/m_customprefix.cpp
+++ b/src/modules/m_customprefix.cpp
@@ -58,7 +58,7 @@ class ModuleCustomPrefix : public Module
 			{
 				ModeHandler* mh = ServerInstance->Modes->FindMode(name, MODETYPE_CHANNEL);
 				if (!mh)
-					throw ModuleException("<customprefix:change> specified for a non-existent mode at " + tag->getTagLocation());
+					throw ModuleException("<customprefix:change> specified for a nonexistent mode at " + tag->getTagLocation());
 
 				PrefixMode* pm = mh->IsPrefixMode();
 				if (!pm)
diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp
index da88d1759..ec8211914 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("Custom title for users", VF_OPTCOMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_cycle.cpp b/src/modules/m_cycle.cpp
index 57c8ea3b2..5f3dddc6f 100644
--- a/src/modules/m_cycle.cpp
+++ b/src/modules/m_cycle.cpp
@@ -84,7 +84,7 @@ class ModuleCycle : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides command CYCLE, acts as a server-side HOP command to part and rejoin a channel.", VF_VENDOR);
+		return Version("Provides the CYCLE command, acts as a server-side HOP command to part and rejoin a channel", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index 86fa50724..00b57bcba 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 support for the DCCALLOW command", VF_COMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp
index a955275ee..90412c5c1 100644
--- a/src/modules/m_deaf.cpp
+++ b/src/modules/m_deaf.cpp
@@ -34,7 +34,7 @@ class DeafMode : public ModeHandler
 			return MODEACTION_DENY;
 
 		if (adding)
-			dest->WriteNotice("*** You have enabled usermode +d, deaf mode. This mode means you WILL NOT receive any messages from any channels you are in. If you did NOT mean to do this, use /mode " + dest->nick + " -d.");
+			dest->WriteNotice("*** You have enabled user mode +d, deaf mode. This mode means you WILL NOT receive any messages from any channels you are in. If you did NOT mean to do this, use /mode " + dest->nick + " -d.");
 
 		dest->SetMode(this, adding);
 		return MODEACTION_ALLOW;
@@ -57,7 +57,7 @@ class PrivDeafMode : public ModeHandler
 			return MODEACTION_DENY;
 
 		if (adding)
-			dest->WriteNotice("*** You have enabled usermode +D, private deaf mode. This mode means you WILL NOT receive any messages and notices from any nicks. If you did NOT mean to do this, use /mode " + dest->nick + " -D.");
+			dest->WriteNotice("*** You have enabled user mode +D, private deaf mode. This mode means you WILL NOT receive any messages and notices from any nicks. If you did NOT mean to do this, use /mode " + dest->nick + " -D.");
 
 		dest->SetMode(this, adding);
 		return MODEACTION_ALLOW;
@@ -140,7 +140,7 @@ class ModuleDeaf : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides usermodes +dD to block channel and/or user messages and notices", VF_VENDOR);
+		return Version("Provides user modes +d and +D to block channel and user messages/notices", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp
index 40a585909..7db60fa64 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 (+D) where users don't appear to join until they speak", VF_VENDOR);
+	return Version("Allows for delay-join channels (channel mode +D) where users don't appear to join 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 5805d4bad..ed37477d8 100644
--- a/src/modules/m_delaymsg.cpp
+++ b/src/modules/m_delaymsg.cpp
@@ -47,7 +47,7 @@ class DelayMsgMode : public ParamMode<DelayMsgMode, LocalIntExt>
 
 class ModuleDelayMsg
 	: public Module
-	, public CTCTags::EventListener 
+	, public CTCTags::EventListener
 {
  private:
 	DelayMsgMode djm;
@@ -91,7 +91,7 @@ void DelayMsgMode::OnUnset(User* source, Channel* chan)
 
 Version ModuleDelayMsg::GetVersion()
 {
-	return Version("Provides channelmode +d <int>, to deny messages to a channel until <int> seconds.", VF_VENDOR);
+	return Version("Provides channel mode +d <int>, to deny messages to a channel until <int> seconds have passed", VF_VENDOR);
 }
 
 void ModuleDelayMsg::OnUserJoin(Membership* memb, bool sync, bool created, CUList&)
@@ -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 channel (+d)", len));
+			user->WriteNumeric(ERR_CANNOTSENDTOCHAN, channel->name, InspIRCd::Format("You must wait %d seconds after joining to send to the channel (+d)", len));
 			return MOD_RES_DENY;
 		}
 	}
diff --git a/src/modules/m_disable.cpp b/src/modules/m_disable.cpp
index fb69f7bec..97013a2da 100644
--- a/src/modules/m_disable.cpp
+++ b/src/modules/m_disable.cpp
@@ -55,7 +55,7 @@ class ModuleDisable : public Module
 			// Check that the mode actually exists.
 			ModeHandler* mh = ServerInstance->Modes->FindMode(chr, type);
 			if (!chr)
-				throw ModuleException(InspIRCd::Format("Non-existent mode '%c' was specified in <disabled:%s> at %s",
+				throw ModuleException(InspIRCd::Format("Nonexistent mode '%c' was specified in <disabled:%s> at %s",
 					chr, field.c_str(), tag->getTagLocation().c_str()));
 
 			// Disable the mode.
@@ -89,7 +89,7 @@ class ModuleDisable : public Module
 			// Check that the command actually exists.
 			Command* handler = ServerInstance->Parser.GetHandler(command);
 			if (!handler)
-				throw ModuleException(InspIRCd::Format("Non-existent command '%s' was specified in <disabled:commands> at %s",
+				throw ModuleException(InspIRCd::Format("Nonexistent command '%s' was specified in <disabled:commands> at %s",
 					command.c_str(), tag->getTagLocation().c_str()));
 
 			// Prevent admins from disabling COMMANDS and MODULES for transparency reasons.
diff --git a/src/modules/m_exemptchanops.cpp b/src/modules/m_exemptchanops.cpp
index a7f86cdb5..61b20fc9b 100644
--- a/src/modules/m_exemptchanops.cpp
+++ b/src/modules/m_exemptchanops.cpp
@@ -116,7 +116,7 @@ class ModuleExemptChanOps : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides the ability to allow channel operators to be exempt from certain modes.",VF_VENDOR);
+		return Version("Provides the ability to allow channel operators to be exempt from certain modes", VF_VENDOR);
 	}
 
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 7a7497d1a..49553545c 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -226,7 +226,7 @@ CmdResult CommandFilter::Handle(User* user, const Params& parameters)
 		}
 		else
 		{
-			user->WriteNotice("*** Filter '" + parameters[0] + "' not found in list, try /stats s.");
+			user->WriteNotice("*** Filter '" + parameters[0] + "' not found on the list.");
 			return CMD_FAILURE;
 		}
 	}
diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index adc1b59ff..8bd63a065 100644
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -169,7 +169,7 @@ class ModuleGlobalLoad : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Allows global loading of a module.", VF_COMMON | VF_VENDOR);
+		return Version("Allows global loading of a module", VF_COMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index f913140d6..5aa719c2f 100644
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -162,7 +162,7 @@ class ModuleHelpop : public Module, public Whois::EventListener
 
 		Version GetVersion() CXX11_OVERRIDE
 		{
-			return Version("Provides the /HELPOP command for useful information", VF_VENDOR);
+			return Version("Provides the HELPOP command for useful information", VF_VENDOR);
 		}
 };
 
diff --git a/src/modules/m_httpd_acl.cpp b/src/modules/m_httpd_acl.cpp
index 8052db4bc..9845e5b0f 100644
--- a/src/modules/m_httpd_acl.cpp
+++ b/src/modules/m_httpd_acl.cpp
@@ -225,7 +225,7 @@ class ModuleHTTPAccessList : public Module, public HTTPACLEventListener
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides access control lists (passwording of resources, ip restrictions etc) to m_httpd dependent modules", VF_VENDOR);
+		return Version("Provides access control lists (passwording of resources, IP restrictions, etc) to m_httpd dependent modules", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 435f30d59..8d6c70092 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -133,7 +133,7 @@ class ModuleKnock : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for /KNOCK and channel mode +K", VF_OPTCOMMON | VF_VENDOR);
+		return Version("Provides the KNOCK command and channel mode +K", VF_OPTCOMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_ldapauth.cpp b/src/modules/m_ldapauth.cpp
index fedf02b4d..b833b9384 100644
--- a/src/modules/m_ldapauth.cpp
+++ b/src/modules/m_ldapauth.cpp
@@ -393,7 +393,7 @@ public:
 		if (user->password.empty())
 		{
 			if (verbose)
-				ServerInstance->SNO->WriteToSnoMask('c', "Forbidden connection from %s (No password provided)", user->GetFullRealHost().c_str());
+				ServerInstance->SNO->WriteToSnoMask('c', "Forbidden connection from %s (no password provided)", user->GetFullRealHost().c_str());
 			ServerInstance->Users->QuitUser(user, killreason);
 			return MOD_RES_DENY;
 		}
@@ -401,7 +401,7 @@ public:
 		if (!LDAP)
 		{
 			if (verbose)
-				ServerInstance->SNO->WriteToSnoMask('c', "Forbidden connection from %s (Unable to find LDAP provider)", user->GetFullRealHost().c_str());
+				ServerInstance->SNO->WriteToSnoMask('c', "Forbidden connection from %s (unable to find LDAP provider)", user->GetFullRealHost().c_str());
 			ServerInstance->Users->QuitUser(user, killreason);
 			return MOD_RES_DENY;
 		}
@@ -440,7 +440,7 @@ public:
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Allow/Deny connections based upon answer from LDAP server", VF_VENDOR);
+		return Version("Allow/deny connections based upon answers from an LDAP server", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_maphide.cpp b/src/modules/m_maphide.cpp
index aade5ea60..5298a8d04 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 /MAP and /LINKS with an URL", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_mlock.cpp b/src/modules/m_mlock.cpp
index 85787ae96..59748048e 100644
--- a/src/modules/m_mlock.cpp
+++ b/src/modules/m_mlock.cpp
@@ -37,7 +37,7 @@ class ModuleMLock : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Implements the ability to have server-side MLOCK enforcement.", VF_VENDOR);
+		return Version("Implements the ability to have server-side MLOCK enforcement", VF_VENDOR);
 	}
 
 	ModResult OnRawMode(User* source, Channel* channel, ModeHandler* mh, const std::string& parameter, bool adding) CXX11_OVERRIDE
@@ -56,7 +56,7 @@ class ModuleMLock : public Module
 		std::string::size_type p = mlock_str->find(mode);
 		if (p != std::string::npos)
 		{
-			source->WriteNumeric(ERR_MLOCKRESTRICTED, channel->name, mode, *mlock_str, "MODE cannot be set due to channel having an active MLOCK restriction policy");
+			source->WriteNumeric(ERR_MLOCKRESTRICTED, channel->name, mode, *mlock_str, "MODE cannot be set due to the channel having an active MLOCK restriction policy");
 			return MOD_RES_DENY;
 		}
 
diff --git a/src/modules/m_modenotice.cpp b/src/modules/m_modenotice.cpp
index 59e0e8dc1..061933323 100644
--- a/src/modules/m_modenotice.cpp
+++ b/src/modules/m_modenotice.cpp
@@ -65,7 +65,7 @@ class ModuleModeNotice : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides the /MODENOTICE command", VF_VENDOR);
+		return Version("Provides the MODENOTICE command", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_namedmodes.cpp b/src/modules/m_namedmodes.cpp
index 977ac625f..2fbdca265 100644
--- a/src/modules/m_namedmodes.cpp
+++ b/src/modules/m_namedmodes.cpp
@@ -129,7 +129,7 @@ class ModuleNamedModes : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides the ability to manipulate modes via long names.",VF_VENDOR);
+		return Version("Provides the ability to manipulate modes via long names", VF_VENDOR);
 	}
 
 	void Prioritize() CXX11_OVERRIDE
diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index ffece5cb4..2b4fd87b4 100644
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -43,7 +43,7 @@ class ModuleNamesX
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides the NAMESX (CAP multi-prefix) capability.",VF_VENDOR);
+		return Version("Provides the NAMESX (CAP multi-prefix) capability", VF_VENDOR);
 	}
 
 	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
diff --git a/src/modules/m_nickflood.cpp b/src/modules/m_nickflood.cpp
index ce8b364e4..17d6db956 100644
--- a/src/modules/m_nickflood.cpp
+++ b/src/modules/m_nickflood.cpp
@@ -202,7 +202,7 @@ class ModuleNickFlood : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Channel mode F - nick flood protection", VF_VENDOR);
+		return Version("Provides channel mode +F, nick flood protection", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index 3155dcb6c..8a87f7df8 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -50,7 +50,7 @@ class ModuleNoKicks : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides channel mode +Q to prevent kicks on the channel.", VF_VENDOR);
+		return Version("Provides channel mode +Q to prevent kicks on the channel", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index f0812ce27..e423acb0c 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -50,7 +50,7 @@ class ModuleOperChans : public Module
 	{
 		if (chan && chan->IsModeSet(oc) && !user->IsOper())
 		{
-			user->WriteNumeric(ERR_CANTJOINOPERSONLY, chan->name, InspIRCd::Format("Only IRC operators may join %s (+O is set)", chan->name.c_str()));
+			user->WriteNumeric(ERR_CANTJOINOPERSONLY, chan->name, InspIRCd::Format("Only server operators may join %s (+O is set)", chan->name.c_str()));
 			return MOD_RES_DENY;
 		}
 		return MOD_RES_PASSTHRU;
diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index 2e02ffddf..11d5d0cee 100644
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -27,7 +27,7 @@ class ModuleOperLevels : public Module
 	public:
 		Version GetVersion() CXX11_OVERRIDE
 		{
-			return Version("Gives each oper type a 'level', cannot kill opers 'above' your level.", VF_VENDOR);
+			return Version("Gives each oper type a 'level', cannot kill opers 'above' your level", VF_VENDOR);
 		}
 
 		ModResult OnKill(User* source, User* dest, const std::string &reason) CXX11_OVERRIDE
@@ -42,10 +42,10 @@ class ModuleOperLevels : public Module
 				{
 					if (IS_LOCAL(source))
 					{
-						ServerInstance->SNO->WriteGlobalSno('a', "Oper %s (level %lu) attempted to /kill a higher oper: %s (level %lu): Reason: %s",
+						ServerInstance->SNO->WriteGlobalSno('a', "Oper %s (level %lu) attempted to /KILL a higher level oper: %s (level %lu), reason: %s",
 							source->nick.c_str(), source_level, dest->nick.c_str(), dest_level, reason.c_str());
 					}
-					dest->WriteNotice("*** Oper " + source->nick + " attempted to /kill you!");
+					dest->WriteNotice("*** Oper " + source->nick + " attempted to /KILL you!");
 					source->WriteNumeric(ERR_NOPRIVILEGES, InspIRCd::Format("Permission Denied - Oper %s is a higher level than you", dest->nick.c_str()));
 					return MOD_RES_DENY;
 				}
diff --git a/src/modules/m_operlog.cpp b/src/modules/m_operlog.cpp
index ffce7ebba..c0deb81ed 100644
--- a/src/modules/m_operlog.cpp
+++ b/src/modules/m_operlog.cpp
@@ -33,7 +33,7 @@ class ModuleOperLog : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("A module which logs all oper commands to the ircd log at default loglevel.", VF_VENDOR);
+		return Version("Provides logging of all oper commands to the ircd log at the default loglevel", VF_VENDOR);
 	}
 
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index 656a63e3c..afce073a8 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -64,18 +64,18 @@ class CommandOpermotd : public Command
 		if (opermotd.empty())
 		{
 			if (show_missing)
-				user->WriteRemoteNumeric(ERR_NOOPERMOTD, "OPERMOTD file is missing");
+				user->WriteRemoteNumeric(ERR_NOOPERMOTD, "OPERMOTD file is missing.");
 			return;
 		}
 
-		user->WriteRemoteNumeric(RPL_OMOTDSTART, "- IRC Operators Message of the Day");
+		user->WriteRemoteNumeric(RPL_OMOTDSTART, "Server operators message of the day");
 
 		for (file_cache::const_iterator i = opermotd.begin(); i != opermotd.end(); ++i)
 		{
 			user->WriteRemoteNumeric(RPL_OMOTD, InspIRCd::Format("- %s", i->c_str()));
 		}
 
-		user->WriteRemoteNumeric(RPL_ENDOFOMOTD, "- End of OPERMOTD");
+		user->WriteRemoteNumeric(RPL_ENDOFOMOTD, "End of OPERMOTD");
 	}
 };
 
@@ -93,7 +93,7 @@ class ModuleOpermotd : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Shows a message to opers after oper-up, adds /opermotd", VF_VENDOR | VF_OPTCOMMON);
+		return Version("Shows a message to opers after oper-up and adds the OPERMOTD command", VF_VENDOR | VF_OPTCOMMON);
 	}
 
 	void OnOper(User* user, const std::string &opertype) CXX11_OVERRIDE
diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp
index a8afd7c96..dbc0a3b5a 100644
--- a/src/modules/m_operprefix.cpp
+++ b/src/modules/m_operprefix.cpp
@@ -101,7 +101,7 @@ class ModuleOperPrefixMode : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Gives opers cmode +y which provides a staff prefix.", VF_VENDOR);
+		return Version("Gives opers channel mode +y which provides a staff prefix", VF_VENDOR);
 	}
 
 	void Prioritize() CXX11_OVERRIDE
diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index 1bb28583e..8e43552e9 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -51,7 +51,7 @@ class ModuleRandQuote : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides random quotes on connect.", VF_VENDOR);
+		return Version("Provides random quotes on connect", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index b71a2f3db..5e14b211e 100644
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -111,7 +111,7 @@ class ModuleRedirect : public Module
 					}
 					else
 					{
-						user->WriteNumeric(470, cname, channel, "You may not join this channel, so you are automatically being transferred to the redirect channel.");
+						user->WriteNumeric(470, cname, channel, "You may not join this channel, so you are automatically being transferred to the redirected channel.");
 						Channel::JoinUser(user, channel);
 						return MOD_RES_DENY;
 					}
diff --git a/src/modules/m_regex_glob.cpp b/src/modules/m_regex_glob.cpp
index 9c3162885..dea079803 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 module using plain wildcard matching", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index 357b2ea41..e23914246 100644
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -87,13 +87,13 @@ class RemoveBase : public Command
 
 		if (!channel->HasUser(target))
 		{
-			user->WriteNotice(InspIRCd::Format("*** The user %s is not on channel %s", target->nick.c_str(), channel->name.c_str()));
+			user->WriteNotice(InspIRCd::Format("*** User %s is not on channel %s", target->nick.c_str(), channel->name.c_str()));
 			return CMD_FAILURE;
 		}
 
 		if (target->server->IsULine())
 		{
-			user->WriteNumeric(ERR_CHANOPRIVSNEEDED, channame, "Only a u-line may remove a u-line from a channel.");
+			user->WriteNumeric(ERR_CHANOPRIVSNEEDED, channame, "Only a U-line may remove a U-line from a channel.");
 			return CMD_FAILURE;
 		}
 
@@ -142,7 +142,7 @@ class RemoveBase : public Command
 			}
 			else
 			{
-				user->WriteNotice(InspIRCd::Format("*** You do not have access to /remove %s from %s", target->nick.c_str(), channel->name.c_str()));
+				user->WriteNotice(InspIRCd::Format("*** You do not have access to /REMOVE %s from %s", target->nick.c_str(), channel->name.c_str()));
 				return CMD_FAILURE;
 			}
 		}
@@ -222,7 +222,7 @@ class ModuleRemove : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		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);
+		return Version("Provides the REMOVE command as an alternative to KICK, it makes users appear to have left the channel", VF_OPTCOMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_restrictmsg.cpp b/src/modules/m_restrictmsg.cpp
index d5d9c818c..531c17029 100644
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -24,7 +24,7 @@
 
 class ModuleRestrictMsg
 	: public Module
-	, public CTCTags::EventListener 
+	, public CTCTags::EventListener
 {
  private:
 	ModResult HandleMessage(User* user, const MessageTarget& target)
@@ -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. Users may still message opers and opers may message other opers", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp
index c7088a855..f9abe2158 100644
--- a/src/modules/m_rline.cpp
+++ b/src/modules/m_rline.cpp
@@ -161,7 +161,7 @@ class CommandRLine : public Command
 			}
 			catch (ModuleException &e)
 			{
-				ServerInstance->SNO->WriteToSnoMask('a',"Could not add RLINE: " + e.GetReason());
+				ServerInstance->SNO->WriteToSnoMask('a', "Could not add R-line: " + e.GetReason());
 			}
 
 			if (r)
@@ -170,11 +170,11 @@ class CommandRLine : public Command
 				{
 					if (!duration)
 					{
-						ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent R-line for %s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[2].c_str());
+						ServerInstance->SNO->WriteToSnoMask('x', "%s added permanent R-line for %s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[2].c_str());
 					}
 					else
 					{
-						ServerInstance->SNO->WriteToSnoMask('x', "%s added timed R-line for %s to expire in %s (on %s): %s",
+						ServerInstance->SNO->WriteToSnoMask('x', "%s added timed R-line for %s, expires in %s (on %s): %s",
 							user->nick.c_str(), parameters[0].c_str(), InspIRCd::DurationString(duration).c_str(),
 							InspIRCd::TimeString(ServerInstance->Time() + duration).c_str(), parameters[2].c_str());
 					}
@@ -198,7 +198,7 @@ class CommandRLine : public Command
 			}
 			else
 			{
-				user->WriteNotice("*** R-line " + parameters[0] + " not found in list, try /stats R.");
+				user->WriteNotice("*** R-line " + parameters[0] + " not found on the list.");
 			}
 		}
 
@@ -246,7 +246,7 @@ class ModuleRLine : public Module, public Stats::EventListener
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("RLINE: Regexp user banning.", VF_COMMON | VF_VENDOR, rxfactory ? rxfactory->name : "");
+		return Version("Provides support for banning users through regular expression patterns", VF_COMMON | VF_VENDOR, rxfactory ? rxfactory->name : "");
 	}
 
 	ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE
diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 4f7bfdb1f..4753ef16f 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 command SAPART to force-part users from a channel.", VF_OPTCOMMON | VF_VENDOR);
+		return Version("Provides the SAPART command to force-part users from a channel", VF_OPTCOMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index cb5245111..54bb8a44a 100644
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -432,7 +432,7 @@ class ModuleSASL : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for IRC Authentication Layer (aka: SASL) via AUTHENTICATE.", VF_VENDOR);
+		return Version("Provides support for IRC Authentication Layer (aka: SASL) via AUTHENTICATE", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 4a06d8aeb..6e15aa8bf 100644
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -54,7 +54,7 @@ class Channel_r : public ModeHandler
 
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE
 	{
-		// only a u-lined server may add or remove the +r mode.
+		// Only a U-lined server may add or remove the +r mode.
 		if (!IS_LOCAL(source))
 		{
 			// Only change the mode if it's not redundant
@@ -312,7 +312,7 @@ class ModuleServicesAccount
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for ircu-style services accounts, including chmode +R, etc.",VF_OPTCOMMON|VF_VENDOR);
+		return Version("Provides support for ircu-style services accounts, including channel mode +R, etc", VF_OPTCOMMON|VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp
index a5d7a82e4..95a601c70 100644
--- a/src/modules/m_servprotect.cpp
+++ b/src/modules/m_servprotect.cpp
@@ -65,7 +65,7 @@ class ModuleServProtectMode : public Module, public Whois::EventListener, public
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides usermode +k to protect services from kicks, kills, and mode changes.", VF_VENDOR);
+		return Version("Provides user mode +k to protect services from kicks, kills, and mode changes", VF_VENDOR);
 	}
 
 	void OnWhois(Whois::Context& whois) CXX11_OVERRIDE
diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index b4e538624..6414b01e7 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -81,7 +81,7 @@ class CommandShun : public Command
 			}
 			else
 			{
-				user->WriteNotice("*** Shun " + parameters[0] + " not found in list, try /stats H.");
+				user->WriteNotice("*** Shun " + parameters[0] + " not found on the list.");
 				return CMD_FAILURE;
 			}
 		}
@@ -115,7 +115,7 @@ class CommandShun : public Command
 				}
 				else
 				{
-					ServerInstance->SNO->WriteToSnoMask('x', "%s added timed SHUN for %s to expire in %s (on %s): %s",
+					ServerInstance->SNO->WriteToSnoMask('x', "%s added timed SHUN for %s, expires in %s (on %s): %s",
 						user->nick.c_str(), target.c_str(), InspIRCd::DurationString(duration).c_str(),
 						InspIRCd::TimeString(ServerInstance->Time() + duration).c_str(), expr.c_str());
 				}
@@ -244,7 +244,7 @@ class ModuleShun : public Module, public Stats::EventListener
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides the /SHUN command, which stops a user from executing all except configured commands.",VF_VENDOR|VF_COMMON);
+		return Version("Provides the SHUN command, which stops a user from executing all except configured commands", VF_VENDOR|VF_COMMON);
 	}
 };
 
diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index 36d024ba5..3b32097ea 100644
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -41,7 +41,7 @@ class SilenceEntry
 
 		// Exclude users who match this flags ("x").
 		SF_EXEMPT = 1,
-	
+
 		// 2, 4, 8, 16 are reserved for future use.
 
 		// Matches a NOTICE targeted at a channel ("n").
@@ -369,7 +369,7 @@ class ModuleSilence
 
 	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		tokens["ESILENCE"] = "CcdiNnPpsTtx";
+		tokens["ESILENCE"] = "CcdiNnPpTtx";
 		tokens["SILENCE"] = ConvToStr(cmd.maxsilence);
 	}
 
diff --git a/src/modules/m_spanningtree/addline.cpp b/src/modules/m_spanningtree/addline.cpp
index a2c459f15..d6c33d2ff 100644
--- a/src/modules/m_spanningtree/addline.cpp
+++ b/src/modules/m_spanningtree/addline.cpp
@@ -31,7 +31,7 @@ CmdResult CommandAddLine::Handle(User* usr, Params& params)
 
 	if (!xlf)
 	{
-		ServerInstance->SNO->WriteToSnoMask('x',"%s sent me an unknown ADDLINE type (%s).",setter.c_str(),params[0].c_str());
+		ServerInstance->SNO->WriteToSnoMask('x', "%s sent me an unknown ADDLINE type (%s).", setter.c_str(), params[0].c_str());
 		return CMD_FAILURE;
 	}
 
@@ -42,7 +42,7 @@ CmdResult CommandAddLine::Handle(User* usr, Params& params)
 	}
 	catch (ModuleException &e)
 	{
-		ServerInstance->SNO->WriteToSnoMask('x',"Unable to ADDLINE type %s from %s: %s", params[0].c_str(), setter.c_str(), e.GetReason().c_str());
+		ServerInstance->SNO->WriteToSnoMask('x', "Unable to ADDLINE type %s from %s: %s", params[0].c_str(), setter.c_str(), e.GetReason().c_str());
 		return CMD_FAILURE;
 	}
 	xl->SetCreateTime(ConvToNum<time_t>(params[3]));
@@ -50,7 +50,7 @@ CmdResult CommandAddLine::Handle(User* usr, Params& params)
 	{
 		if (xl->duration)
 		{
-			ServerInstance->SNO->WriteToSnoMask('X', "%s added %s%s on %s to expire in %s (on %s): %s",
+			ServerInstance->SNO->WriteToSnoMask('X', "%s added timed %s%s for %s, expires in %s (on %s): %s",
 				setter.c_str(), params[0].c_str(), params[0].length() == 1 ? "-line" : "",
 				params[1].c_str(), InspIRCd::DurationString(xl->duration).c_str(),
 				InspIRCd::TimeString(xl->expiry).c_str(), params[5].c_str());
diff --git a/src/modules/m_spanningtree/ijoin.cpp b/src/modules/m_spanningtree/ijoin.cpp
index d33ef3d4e..85838cc7f 100644
--- a/src/modules/m_spanningtree/ijoin.cpp
+++ b/src/modules/m_spanningtree/ijoin.cpp
@@ -30,7 +30,7 @@ CmdResult CommandIJoin::HandleRemote(RemoteUser* user, Params& params)
 	{
 		// Desync detected, recover
 		// Ignore the join and send RESYNC, this will result in the remote server sending all channel data to us
-		ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Received IJOIN for non-existant channel: " + params[0]);
+		ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Received IJOIN for nonexistent channel: " + params[0]);
 
 		CmdBuilder("RESYNC").push(params[0]).Unicast(user);
 
diff --git a/src/modules/m_spanningtree/netburst.cpp b/src/modules/m_spanningtree/netburst.cpp
index 30a37baee..ed15591e9 100644
--- a/src/modules/m_spanningtree/netburst.cpp
+++ b/src/modules/m_spanningtree/netburst.cpp
@@ -103,7 +103,7 @@ struct TreeSocket::BurstState
  */
 void TreeSocket::DoBurst(TreeServer* s)
 {
-	ServerInstance->SNO->WriteToSnoMask('l',"Bursting to \2%s\2 (Authentication: %s%s).",
+	ServerInstance->SNO->WriteToSnoMask('l',"Bursting to \002%s\002 (Authentication: %s%s).",
 		s->GetName().c_str(),
 		capab->auth_fingerprint ? "SSL certificate fingerprint and " : "",
 		capab->auth_challenge ? "challenge-response" : "plaintext password");
@@ -125,7 +125,7 @@ void TreeSocket::DoBurst(TreeServer* s)
 	this->SendXLines();
 	FOREACH_MOD_CUSTOM(Utils->Creator->GetEventProvider(), ServerEventListener, OnSyncNetwork, (bs.server));
 	this->WriteLine(CmdBuilder("ENDBURST"));
-	ServerInstance->SNO->WriteToSnoMask('l',"Finished bursting to \2"+ s->GetName()+"\2.");
+	ServerInstance->SNO->WriteToSnoMask('l',"Finished bursting to \002"+ s->GetName()+"\002.");
 
 	this->burstsent = true;
 }
diff --git a/src/modules/m_spanningtree/opertype.cpp b/src/modules/m_spanningtree/opertype.cpp
index 99c5ea8bc..692588b5e 100644
--- a/src/modules/m_spanningtree/opertype.cpp
+++ b/src/modules/m_spanningtree/opertype.cpp
@@ -53,7 +53,7 @@ CmdResult CommandOpertype::HandleRemote(RemoteUser* u, CommandBase::Params& para
 			return CMD_SUCCESS;
 	}
 
-	ServerInstance->SNO->WriteToSnoMask('O',"From %s: User %s (%s@%s) is now an IRC operator of type %s",u->server->GetName().c_str(), u->nick.c_str(),u->ident.c_str(), u->GetRealHost().c_str(), opertype.c_str());
+	ServerInstance->SNO->WriteToSnoMask('O', "From %s: User %s (%s@%s) is now a server operator of type %s", u->server->GetName().c_str(), u->nick.c_str(),u->ident.c_str(), u->GetRealHost().c_str(), opertype.c_str());
 	return CMD_SUCCESS;
 }
 
diff --git a/src/modules/m_spanningtree/server.cpp b/src/modules/m_spanningtree/server.cpp
index e724a644d..0af91a0ed 100644
--- a/src/modules/m_spanningtree/server.cpp
+++ b/src/modules/m_spanningtree/server.cpp
@@ -48,14 +48,14 @@ CmdResult CommandServer::HandleServer(TreeServer* ParentOfThis, Params& params)
 	if (CheckDupe)
 	{
 		socket->SendError("Server "+servername+" already exists!");
-		ServerInstance->SNO->WriteToSnoMask('L', "Server \2"+CheckDupe->GetName()+"\2 being introduced from \2" + ParentOfThis->GetName() + "\2 denied, already exists. Closing link with " + ParentOfThis->GetName());
+		ServerInstance->SNO->WriteToSnoMask('L', "Server \002"+CheckDupe->GetName()+"\002 being introduced from \002" + ParentOfThis->GetName() + "\002 denied, already exists. Closing link with " + ParentOfThis->GetName());
 		return CMD_FAILURE;
 	}
 	CheckDupe = Utils->FindServer(sid);
 	if (CheckDupe)
 	{
 		socket->SendError("Server ID "+sid+" already exists! You may want to specify the server ID for the server manually with <server:id> so they do not conflict.");
-		ServerInstance->SNO->WriteToSnoMask('L', "Server \2"+servername+"\2 being introduced from \2" + ParentOfThis->GetName() + "\2 denied, server ID already exists on the network. Closing link with " + ParentOfThis->GetName());
+		ServerInstance->SNO->WriteToSnoMask('L', "Server \002"+servername+"\002 being introduced from \002" + ParentOfThis->GetName() + "\002 denied, server ID already exists on the network. Closing link with " + ParentOfThis->GetName());
 		return CMD_FAILURE;
 	}
 
@@ -119,14 +119,14 @@ Link* TreeSocket::AuthRemote(const CommandBase::Params& params)
 
 		if (!ComparePass(*x, password))
 		{
-			ServerInstance->SNO->WriteToSnoMask('l',"Invalid password on link: %s", x->Name.c_str());
+			ServerInstance->SNO->WriteToSnoMask('l', "Invalid password on link: %s", x->Name.c_str());
 			continue;
 		}
 
 		if (!CheckDuplicate(sname, sid))
 			return NULL;
 
-		ServerInstance->SNO->WriteToSnoMask('l',"Verified server connection " + linkID + " ("+description+")");
+		ServerInstance->SNO->WriteToSnoMask('l', "Verified server connection " + linkID + " ("+description+")");
 
 		const SSLIOHook* const ssliohook = SSLIOHook::IsSSL(this);
 		if (ssliohook)
@@ -139,8 +139,8 @@ Link* TreeSocket::AuthRemote(const CommandBase::Params& params)
 		return x;
 	}
 
-	this->SendError("Mismatched server name or password (check the other server's snomask output for details - e.g. umode +s +Ll)");
-	ServerInstance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, invalid link credentials");
+	this->SendError("Mismatched server name or password (check the other server's snomask output for details - e.g. user mode +s +Ll)");
+	ServerInstance->SNO->WriteToSnoMask('l', "Server connection from \002"+sname+"\002 denied, invalid link credentials");
 	return NULL;
 }
 
@@ -177,7 +177,7 @@ bool TreeSocket::CheckDuplicate(const std::string& sname, const std::string& sid
 	{
 		std::string pname = CheckDupe->GetParent() ? CheckDupe->GetParent()->GetName() : "<ourself>";
 		SendError("Server "+sname+" already exists on server "+pname+"!");
-		ServerInstance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, already exists on server "+pname);
+		ServerInstance->SNO->WriteToSnoMask('l', "Server connection from \002"+sname+"\002 denied, already exists on server "+pname);
 		return false;
 	}
 
@@ -188,7 +188,7 @@ bool TreeSocket::CheckDuplicate(const std::string& sname, const std::string& sid
 	if (CheckDupe)
 	{
 		this->SendError("Server ID "+CheckDupe->GetID()+" already exists on server "+CheckDupe->GetName()+"! You may want to specify the server ID for the server manually with <server:id> so they do not conflict.");
-		ServerInstance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, server ID '"+CheckDupe->GetID()+
+		ServerInstance->SNO->WriteToSnoMask('l', "Server connection from \002"+sname+"\002 denied, server ID '"+CheckDupe->GetID()+
 				"' already exists on server "+CheckDupe->GetName());
 		return false;
 	}
diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index 65e0a2c4d..bbe66ff83 100644
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -152,7 +152,7 @@ void TreeServer::FinishBurst()
 	ServerInstance->XLines->ApplyLines();
 	uint64_t ts = ServerInstance->Time() * 1000 + (ServerInstance->Time_ns() / 1000000);
 	unsigned long bursttime = ts - this->StartBurst;
-	ServerInstance->SNO->WriteToSnoMask(Parent == Utils->TreeRoot ? 'l' : 'L', "Received end of netburst from \2%s\2 (burst time: %lu %s)",
+	ServerInstance->SNO->WriteToSnoMask(Parent == Utils->TreeRoot ? 'l' : 'L', "Received end of netburst from \002%s\002 (burst time: %lu %s)",
 		GetName().c_str(), (bursttime > 10000 ? bursttime / 1000 : bursttime), (bursttime > 10000 ? "secs" : "msecs"));
 
 	StartBurst = 0;
diff --git a/src/modules/m_spanningtree/treeserver.h b/src/modules/m_spanningtree/treeserver.h
index 037edd194..ffe0373d2 100644
--- a/src/modules/m_spanningtree/treeserver.h
+++ b/src/modules/m_spanningtree/treeserver.h
@@ -153,7 +153,7 @@ class TreeServer : public Server
 	 */
 	unsigned long rtt;
 
-	/** When we recieved BURST from this server, used to calculate total burst time at ENDBURST.
+	/** When we received BURST from this server, used to calculate total burst time at ENDBURST.
 	 */
 	uint64_t StartBurst;
 
diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 1913fa4de..190c5dc15 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -52,7 +52,7 @@ TreeSocket::TreeSocket(Link* link, Autoconnect* myac, const irc::sockets::sockad
 		if (!irc::sockets::aptosa(link->Bind, 0, bind))
 		{
 			state = I_ERROR;
-			SetError("Bind address '" + link->Bind + "' is not an valid IPv4 or IPv6 address");
+			SetError("Bind address '" + link->Bind + "' is not a valid IPv4 or IPv6 address");
 			TreeSocket::OnError(I_ERR_BIND);
 			return;
 		}
@@ -143,7 +143,7 @@ void TreeSocket::OnConnected()
 			static_cast<IOHookProvider*>(prov)->OnConnect(this);
 		}
 
-		ServerInstance->SNO->WriteGlobalSno('l', "Connection to \2%s\2[%s] started.", linkID.c_str(),
+		ServerInstance->SNO->WriteGlobalSno('l', "Connection to \002%s\002[%s] started.", linkID.c_str(),
 			(capab->link->HiddenFromStats ? "<hidden>" : capab->link->IPAddr.c_str()));
 		this->SendCapabilities(1);
 	}
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 364586dff..05d85aa67 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -161,13 +161,13 @@ void TreeSocket::ProcessLine(std::string &line)
 					time_t delta = them - ServerInstance->Time();
 					if ((delta < -600) || (delta > 600))
 					{
-						ServerInstance->SNO->WriteGlobalSno('l',"\2ERROR\2: Your clocks are out by %ld seconds (this is more than five minutes). Link aborted, \2PLEASE SYNC YOUR CLOCKS!\2",labs((long)delta));
+						ServerInstance->SNO->WriteGlobalSno('l', "\002ERROR\002: Your clocks are off by %ld seconds (this is more than five minutes). Link aborted, \002PLEASE SYNC YOUR CLOCKS!\002", labs((long)delta));
 						SendError("Your clocks are out by "+ConvToStr(labs((long)delta))+" seconds (this is more than five minutes). Link aborted, PLEASE SYNC YOUR CLOCKS!");
 						return;
 					}
 					else if ((delta < -30) || (delta > 30))
 					{
-						ServerInstance->SNO->WriteGlobalSno('l',"\2WARNING\2: Your clocks are out by %ld seconds. Please consider synching your clocks.", labs((long)delta));
+						ServerInstance->SNO->WriteGlobalSno('l', "\002WARNING\002: Your clocks are off by %ld seconds. Please consider syncing your clocks.", labs((long)delta));
 					}
 				}
 
@@ -417,13 +417,13 @@ void TreeSocket::Close()
 	if (MyRoot)
 		MyRoot->SQuit(getError());
 
-	ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\2%s\2' failed.",linkID.c_str());
+	ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\002%s\002' failed.", linkID.c_str());
 
 	time_t server_uptime = ServerInstance->Time() - this->age;
 	if (server_uptime)
 	{
 		std::string timestr = ModuleSpanningTree::TimeToStr(server_uptime);
-		ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\2%s\2' was established for %s", linkID.c_str(), timestr.c_str());
+		ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\002%s\002' was established for %s", linkID.c_str(), timestr.c_str());
 	}
 }
 
diff --git a/src/modules/m_sqlauth.cpp b/src/modules/m_sqlauth.cpp
index d2466f719..54ff7e088 100644
--- a/src/modules/m_sqlauth.cpp
+++ b/src/modules/m_sqlauth.cpp
@@ -86,7 +86,7 @@ class AuthQuery : public SQL::Query
 				}
 
 				if (verbose)
-					ServerInstance->SNO->WriteGlobalSno('a', "Forbidden connection from %s (Password from the SQL query did not match the user provided password)", user->GetFullRealHost().c_str());
+					ServerInstance->SNO->WriteGlobalSno('a', "Forbidden connection from %s (password from the SQL query did not match the user provided password)", user->GetFullRealHost().c_str());
 				pendingExt.set(user, AUTH_STATE_FAIL);
 				return;
 			}
@@ -171,7 +171,7 @@ class ModuleSQLAuth : public Module
 
 		if (!SQL)
 		{
-			ServerInstance->SNO->WriteGlobalSno('a', "Forbiding connection from %s (SQL database not present)", user->GetFullRealHost().c_str());
+			ServerInstance->SNO->WriteGlobalSno('a', "Forbidden connection from %s (SQL database not present)", user->GetFullRealHost().c_str());
 			ServerInstance->Users->QuitUser(user, killreason);
 			return MOD_RES_PASSTHRU;
 		}
@@ -212,7 +212,7 @@ class ModuleSQLAuth : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Allow/Deny connections based upon an arbitrary SQL table", VF_VENDOR);
+		return Version("Allow/deny connections based upon an arbitrary SQL table", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_sqloper.cpp b/src/modules/m_sqloper.cpp
index 8ba8e3103..e4aaab474 100644
--- a/src/modules/m_sqloper.cpp
+++ b/src/modules/m_sqloper.cpp
@@ -110,7 +110,7 @@ class OperQuery : public SQL::Query
 	void OnError(SQL::Error& error) CXX11_OVERRIDE
 	{
 		ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "query failed (%s)", error.ToString());
-		ServerInstance->SNO->WriteGlobalSno('a', "m_sqloper: failed to update blocks from database");
+		ServerInstance->SNO->WriteGlobalSno('a', "m_sqloper: Failed to update blocks from database");
 		if (!uid.empty())
 		{
 			// Fallback. We don't want to block a netadmin from /OPER
diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index 5c436b116..1ff93b7ad 100644
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -159,7 +159,7 @@ class ModuleSSLModes
 		{
 			if (!api)
 			{
-				user->WriteNumeric(ERR_SECUREONLYCHAN, cname, "Cannot join channel; unable to determine if you are a SSL user (+z)");
+				user->WriteNumeric(ERR_SECUREONLYCHAN, cname, "Cannot join channel; unable to determine if you are an SSL user (+z)");
 				return MOD_RES_DENY;
 			}
 
@@ -199,7 +199,7 @@ class ModuleSSLModes
 		{
 			if (!api || !api->GetCertificate(target))
 			{
-				user->WriteNumeric(ERR_CANTSENDTOUSER, target->nick, "You must remove usermode 'z' before you are able to send private messages to a non-ssl user.");
+				user->WriteNumeric(ERR_CANTSENDTOUSER, target->nick, "You must remove user mode 'z' before you are able to send private messages to a non-SSL user.");
 				return MOD_RES_DENY;
 			}
 		}
@@ -235,7 +235,7 @@ class ModuleSSLModes
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides user and channel mode +z to allow for SSL-only channels, queries and notices.", VF_VENDOR);
+		return Version("Provides user and channel mode +z to allow for SSL-only channels, queries and notices", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp
index 3699fc3aa..4634cfaff 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 +S mode (strip ansi color)", VF_VENDOR);
+		return Version("Provides channel mode +S (strip ansi color)", VF_VENDOR);
 	}
 
 };
diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index c1249a3bd..df487199a 100644
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -121,7 +121,7 @@ class CommandSvshold : public Command
 			}
 			else
 			{
-				user->WriteNotice("*** SVSHOLD " + parameters[0] + " not found in list, try /stats S.");
+				user->WriteNotice("*** SVSHOLD " + parameters[0] + " not found on the list.");
 			}
 		}
 		else
@@ -223,7 +223,7 @@ class ModuleSVSHold : public Module, public Stats::EventListener
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Implements SVSHOLD. Like Q-lines, but can only be added/removed by Services.", VF_COMMON | VF_VENDOR);
+		return Version("Implements SVSHOLD, like Q-lines, but can only be added/removed by Services", VF_COMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_tline.cpp b/src/modules/m_tline.cpp
index 692472e11..f8c0842b7 100644
--- a/src/modules/m_tline.cpp
+++ b/src/modules/m_tline.cpp
@@ -79,7 +79,7 @@ class ModuleTLine : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides /tline command used to test who a mask matches", VF_VENDOR);
+		return Version("Provides the TLINE command, used to test how many users a mask matches against", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_uhnames.cpp b/src/modules/m_uhnames.cpp
index f750c1a6e..7f9975a55 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 facility", VF_VENDOR);
 	}
 
 	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
diff --git a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp
index a64dc7071..925024aea 100644
--- a/src/modules/m_xline_db.cpp
+++ b/src/modules/m_xline_db.cpp
@@ -217,7 +217,7 @@ class ModuleXLineDB : public Module
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Keeps a dynamic log of all XLines created, and stores them in a separate conf file (xline.db).", VF_VENDOR);
+		return Version("Provides the ability to store X-lines in a database file", VF_VENDOR);
 	}
 };