Replaced notice_lang with notice_help in all OnHelp() functions in modules. Also fixed a few smaller issues regarding the help in the modules.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2053 5417fbe8-f217-4b02-8779-1006273d7864

100 files changed, 230 insertions, 220 deletions

diff --git a/src/core/bs_assign.c b/src/core/bs_assign.c
index 73bbd6213..5efd6ae41 100644
--- a/src/core/bs_assign.c
+++ b/src/core/bs_assign.c
@@ -36,43 +36,43 @@ class CommandBSAssign : public Command
 			notice_lang(s_BotServ, u, BOT_ASSIGN_READONLY);
 			return MOD_CONT;
 		}
-		
+
 		if (!(bi = findbot(nick)))
 		{
 			notice_lang(s_BotServ, u, BOT_DOES_NOT_EXIST, nick);
 			return MOD_CONT;
 		}
-		
+
 		if (bi->flags & BI_PRIVATE && !is_oper(u))
 		{
 			notice_lang(s_BotServ, u, PERMISSION_DENIED);
 			return MOD_CONT;
 		}
-		
+
 		if (!(ci = cs_findchan(chan)))
 		{
 			notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
 			return MOD_CONT;
 		}
-		
+
 		if (ci->flags & CI_FORBIDDEN)
 		{
 			notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
 			return MOD_CONT;
 		}
-		
+
 		if ((ci->bi) && (stricmp(ci->bi->nick, nick) == 0))
 		{
 			notice_lang(s_BotServ, u, BOT_ASSIGN_ALREADY, ci->bi->nick, chan);
 			return MOD_CONT;
 		}
-		
+
 		if ((ci->botflags & BS_NOBOT) || (!check_access(u, ci, CA_ASSIGN) && !is_services_admin(u)))
 		{
 			notice_lang(s_BotServ, u, PERMISSION_DENIED);
 			return MOD_CONT;
 		}
-		
+
 		bi->Assign(u, ci);
 		notice_lang(s_BotServ, u, BOT_ASSIGN_ASSIGNED, bi->nick, ci->name);
 		return MOD_CONT;
@@ -80,7 +80,7 @@ class CommandBSAssign : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_BotServ, u, BOT_HELP_ASSIGN);
+		notice_help(s_BotServ, u, BOT_HELP_ASSIGN);
 		return true;
 	}
 
diff --git a/src/core/bs_badwords.c b/src/core/bs_badwords.c
index eab919c2b..0b0352027 100644
--- a/src/core/bs_badwords.c
+++ b/src/core/bs_badwords.c
@@ -54,7 +54,7 @@ class CommandBSBadwords : public Command
 
 		return MOD_CONT;
 	}
-	
+
 	CommandReturn DoAdd(User *u, ChannelInfo *ci, const char *word)
 	{
 		char *opt, *pos;
@@ -165,7 +165,7 @@ class CommandBSBadwords : public Command
 				if (!ci->badwords[i].in_use)
 					break;
 			}
-			
+
 			if (i == ci->bwcount)
 			{
 				notice_lang(s_BotServ, u, BOT_BADWORDS_NOT_FOUND, word, ci->name);
@@ -298,7 +298,7 @@ class CommandBSBadwords : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_BotServ, u, BOT_HELP_BADWORDS);
+		notice_help(s_BotServ, u, BOT_HELP_BADWORDS);
 		return true;
 	}
 
diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c
index 86804e044..0aa569d4b 100644
--- a/src/core/bs_bot.c
+++ b/src/core/bs_bot.c
@@ -407,7 +407,7 @@ class CommandBSBot : public Command
 		if (!is_services_admin(u) && !is_services_root(u))
 			return false;
 
-		notice_lang(s_BotServ, u, BOT_SERVADMIN_HELP_BOT);
+		notice_help(s_BotServ, u, BOT_SERVADMIN_HELP_BOT);
 		return true;
 	}
 
diff --git a/src/core/bs_botlist.c b/src/core/bs_botlist.c
index c9f4fc350..befd10d7c 100644
--- a/src/core/bs_botlist.c
+++ b/src/core/bs_botlist.c
@@ -69,7 +69,7 @@ class CommandBSBotList : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_BotServ, u, BOT_HELP_BOTLIST);
+		notice_help(s_BotServ, u, BOT_HELP_BOTLIST);
 		return true;
 	}
 };
diff --git a/src/core/bs_info.c b/src/core/bs_info.c
index cb1b22c40..d67314503 100644
--- a/src/core/bs_info.c
+++ b/src/core/bs_info.c
@@ -239,7 +239,7 @@ class CommandBSInfo : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_BotServ, u, BOT_HELP_INFO);
+		notice_help(s_BotServ, u, BOT_HELP_INFO);
 		return true;
 	}
 
diff --git a/src/core/bs_say.c b/src/core/bs_say.c
index 2643ff650..18f029b1c 100644
--- a/src/core/bs_say.c
+++ b/src/core/bs_say.c
@@ -23,7 +23,7 @@ class CommandBSSay : public Command
 	CommandBSSay() : Command("SAY", 2, 2)
 	{
 	}
-	
+
 	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
 		ChannelInfo *ci;
@@ -36,25 +36,25 @@ class CommandBSSay : public Command
 			notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
 			return MOD_CONT;
 		}
-		
+
 		if (ci->flags & CI_FORBIDDEN)
 		{
 			notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
 			return MOD_CONT;
 		}
-		
+
 		if (!ci->bi)
 		{
 			notice_help(s_BotServ, u, BOT_NOT_ASSIGNED);
 			return MOD_CONT;
 		}
-		
+
 		if (!ci->c || ci->c->usercount < BSMinUsers)
 		{
 			notice_lang(s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name);
 			return MOD_CONT;
 		}
-		
+
 		if (!check_access(u, ci, CA_SAY))
 		{
 			notice_lang(s_BotServ, u, ACCESS_DENIED);
@@ -66,7 +66,7 @@ class CommandBSSay : public Command
 			this->OnSyntaxError(u);
 			return MOD_CONT;
 		}
-		
+
 		ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", text);
 		ci->bi->lastmsg = time(NULL);
 		if (LogBot && LogChannel && logchan && !debug && findchan(LogChannel))
@@ -76,7 +76,7 @@ class CommandBSSay : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_BotServ, u, BOT_HELP_SAY);
+		notice_help(s_BotServ, u, BOT_HELP_SAY);
 		return true;
 	}
 
diff --git a/src/core/bs_set.c b/src/core/bs_set.c
index f29da1304..8a1dda6ec 100644
--- a/src/core/bs_set.c
+++ b/src/core/bs_set.c
@@ -22,7 +22,6 @@ class CommandBSSet : public Command
  public:
 	CommandBSSet() : Command("SET", 3, 3)
 	{
-		this->help_param1 = s_ChanServ;
 	}
 
 	CommandReturn Execute(User *u, std::vector<std::string> &params)
@@ -153,25 +152,24 @@ class CommandBSSet : public Command
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
 		if (subcommand == "DONTKICKOPS")
-		notice_lang(s_BotServ, u, BOT_HELP_SET_DONTKICKOPS);
+			notice_help(s_BotServ, u, BOT_HELP_SET_DONTKICKOPS);
 		else if (subcommand == "DONTKICKVOICES")
-		notice_lang(s_BotServ, u, BOT_HELP_SET_DONTKICKVOICES);
+			notice_help(s_BotServ, u, BOT_HELP_SET_DONTKICKVOICES);
 		else if (subcommand == "FANTASY")
-		notice_lang(s_BotServ, u, BOT_HELP_SET_FANTASY);
+			notice_help(s_BotServ, u, BOT_HELP_SET_FANTASY);
 		else if (subcommand == "GREET")
-		notice_lang(s_BotServ, u, BOT_HELP_SET_GREET);
+			notice_help(s_BotServ, u, BOT_HELP_SET_GREET);
 		else if (subcommand == "SYMBIOSIS")
-		notice_lang(s_BotServ, u, BOT_HELP_SET_SYMBIOSIS);
+			notice_help(s_BotServ, u, BOT_HELP_SET_SYMBIOSIS, s_ChanServ);
 		else if (subcommand == "NOBOT" && (is_services_admin(u) || is_services_root(u)))
-			notice_lang(s_BotServ, u, BOT_SERVADMIN_HELP_SET_NOBOT);
+			notice_help(s_BotServ, u, BOT_SERVADMIN_HELP_SET_NOBOT);
 		else if (subcommand == "PRIVATE" && (is_services_admin(u) || is_services_root(u)))
-			notice_lang(s_BotServ, u, BOT_SERVADMIN_HELP_SET_PRIVATE);
+			notice_help(s_BotServ, u, BOT_SERVADMIN_HELP_SET_PRIVATE);
 		else if (subcommand.empty())
 		{
+			notice_help(s_BotServ, u, BOT_HELP_SET);
 			if (is_services_admin(u) || is_services_root(u))
-				notice_lang(s_BotServ, u, BOT_SERVADMIN_HELP_SET);
-			else
-				notice_lang(s_BotServ, u, BOT_HELP_SET);
+				notice_help(s_BotServ, u, BOT_SERVADMIN_HELP_SET);
 		}
 
 		return true;
diff --git a/src/core/bs_unassign.c b/src/core/bs_unassign.c
index 564c8817d..944066c41 100644
--- a/src/core/bs_unassign.c
+++ b/src/core/bs_unassign.c
@@ -49,7 +49,7 @@ class CommandBSUnassign : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_BotServ, u, BOT_HELP_UNASSIGN);
+		notice_help(s_BotServ, u, BOT_HELP_UNASSIGN);
 		return true;
 	}
 
diff --git a/src/core/cs_access.c b/src/core/cs_access.c
index fffa8da38..ec58b75ea 100644
--- a/src/core/cs_access.c
+++ b/src/core/cs_access.c
@@ -376,8 +376,8 @@ class CommandCSAccess : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_ACCESS);
-		notice_lang(s_ChanServ, u, CHAN_HELP_ACCESS_LEVELS);
+		notice_help(s_ChanServ, u, CHAN_HELP_ACCESS);
+		notice_help(s_ChanServ, u, CHAN_HELP_ACCESS_LEVELS);
 		return true;
 	}
 };
@@ -509,7 +509,7 @@ class CommandCSLevels : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_LEVELS);
+		notice_help(s_ChanServ, u, CHAN_HELP_LEVELS);
 		return true;
 	}
 };
diff --git a/src/core/cs_akick.c b/src/core/cs_akick.c
index bc21a81a5..4bd2b10bd 100644
--- a/src/core/cs_akick.c
+++ b/src/core/cs_akick.c
@@ -636,7 +636,7 @@ class CommandCSAKick : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_AKICK);
+		notice_help(s_ChanServ, u, CHAN_HELP_AKICK);
 		return true;
 	}
 
diff --git a/src/core/cs_ban.c b/src/core/cs_ban.c
index 51288fa6e..bb0b6d13b 100644
--- a/src/core/cs_ban.c
+++ b/src/core/cs_ban.c
@@ -41,7 +41,7 @@ class CommandCSBan : public Command
 		const char *chan = params[0].c_str();
 		const char *target = params[1].c_str();
 		const char *reason = NULL;
-		
+
 		if (params.size() > 2)
 		{
 			params[2].resize(200);
@@ -116,7 +116,7 @@ class CommandCSBan : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_BAN);
+		notice_help(s_ChanServ, u, CHAN_HELP_BAN);
 		return true;
 	}
 
@@ -174,7 +174,7 @@ class CommandCSUnban : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_UNBAN);
+		notice_help(s_ChanServ, u, CHAN_HELP_UNBAN);
 		return true;
 	}
 
diff --git a/src/core/cs_clear.c b/src/core/cs_clear.c
index 48ee0cf9d..12780a43e 100644
--- a/src/core/cs_clear.c
+++ b/src/core/cs_clear.c
@@ -340,7 +340,7 @@ class CommandCSClear : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_CLEAR);
+		notice_help(s_ChanServ, u, CHAN_HELP_CLEAR);
 		return true;
 	}
 
diff --git a/src/core/cs_drop.c b/src/core/cs_drop.c
index 6dfa016d9..d5ca0bcd0 100644
--- a/src/core/cs_drop.c
+++ b/src/core/cs_drop.c
@@ -106,9 +106,9 @@ class CommandCSDrop : public Command
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
 		if (is_services_admin(u) || is_services_root(u))
-            notice_lang(s_ChanServ, u, CHAN_SERVADMIN_HELP_DROP);
+			notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_DROP);
 		else
-			notice_lang(s_ChanServ, u, CHAN_HELP_DROP);
+			notice_help(s_ChanServ, u, CHAN_HELP_DROP);
 
 		return true;
 	}
diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.c
index 29c365b1c..7acf5c654 100644
--- a/src/core/cs_forbid.c
+++ b/src/core/cs_forbid.c
@@ -121,7 +121,7 @@ class CommandCSForbid : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_ChanServ, u, CHAN_SERVADMIN_HELP_FORBID);
+		notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_FORBID);
 		return true;
 	}
 
diff --git a/src/core/cs_getkey.c b/src/core/cs_getkey.c
index 1546002e0..1957d49cd 100644
--- a/src/core/cs_getkey.c
+++ b/src/core/cs_getkey.c
@@ -68,7 +68,7 @@ class CommandCSGetKey : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_GETKEY);
+		notice_help(s_ChanServ, u, CHAN_HELP_GETKEY);
 		return true;
 	}
 
diff --git a/src/core/cs_getpass.c b/src/core/cs_getpass.c
index 060325c82..c4f75fda2 100644
--- a/src/core/cs_getpass.c
+++ b/src/core/cs_getpass.c
@@ -74,7 +74,7 @@ class CommandCSGetPass : public Command
 	{
 		if (is_services_admin(u))
 		{
-			notice_lang(s_ChanServ, u, CHAN_SERVADMIN_HELP_GETPASS);
+			notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_GETPASS);
 			return true;
 		}
 
diff --git a/src/core/cs_identify.c b/src/core/cs_identify.c
index f0f1f439a..7819f6091 100644
--- a/src/core/cs_identify.c
+++ b/src/core/cs_identify.c
@@ -103,7 +103,7 @@ class CommandCSIdentify : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_IDENTIFY);
+		notice_help(s_ChanServ, u, CHAN_HELP_IDENTIFY);
 		return true;
 	}
 
diff --git a/src/core/cs_invite.c b/src/core/cs_invite.c
index ee4869b1b..2ce12508e 100644
--- a/src/core/cs_invite.c
+++ b/src/core/cs_invite.c
@@ -71,7 +71,7 @@ class CommandCSInvite : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_INVITE);
+		notice_help(s_ChanServ, u, CHAN_HELP_INVITE);
 		return true;
 	}
 
diff --git a/src/core/cs_kick.c b/src/core/cs_kick.c
index f2895d1aa..be71fb4f5 100644
--- a/src/core/cs_kick.c
+++ b/src/core/cs_kick.c
@@ -94,7 +94,7 @@ class CommandCSKick : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_KICK);
+		notice_help(s_ChanServ, u, CHAN_HELP_KICK);
 		return true;
 	}
 
diff --git a/src/core/cs_list.c b/src/core/cs_list.c
index b91889be1..913c76e5a 100644
--- a/src/core/cs_list.c
+++ b/src/core/cs_list.c
@@ -180,7 +180,7 @@ public:
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_LIST);
+		notice_help(s_ChanServ, u, CHAN_HELP_LIST);
 		return true;
 	}
 
diff --git a/src/core/cs_logout.c b/src/core/cs_logout.c
index 670e65865..f46438059 100644
--- a/src/core/cs_logout.c
+++ b/src/core/cs_logout.c
@@ -115,8 +115,8 @@ class CommandCSLogout : public Command
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
 		if (is_services_admin(u) || is_services_root(u))
-			notice_lang(s_NickServ, u, CHAN_SERVADMIN_HELP_LOGOUT);
-		notice_lang(s_NickServ, u, CHAN_HELP_LOGOUT);
+			notice_help(s_NickServ, u, CHAN_SERVADMIN_HELP_LOGOUT);
+		notice_help(s_NickServ, u, CHAN_HELP_LOGOUT);
 		return true;
 	}
 
diff --git a/src/core/cs_modes.c b/src/core/cs_modes.c
index 183ebe029..25617fffb 100644
--- a/src/core/cs_modes.c
+++ b/src/core/cs_modes.c
@@ -133,7 +133,7 @@ class CommandCSOp : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_OP);
+		notice_help(s_ChanServ, u, CHAN_HELP_OP);
 		return true;
 	}
 };
@@ -154,7 +154,7 @@ class CommandCSDeOp : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_DEOP);
+		notice_help(s_ChanServ, u, CHAN_HELP_DEOP);
 		return true;
 	}
 };
@@ -175,7 +175,7 @@ class CommandCSVoice : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_VOICE);
+		notice_help(s_ChanServ, u, CHAN_HELP_VOICE);
 		return true;
 	}
 };
@@ -196,7 +196,7 @@ class CommandCSDeVoice : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_DEVOICE);
+		notice_help(s_ChanServ, u, CHAN_HELP_DEVOICE);
 		return true;
 	}
 };
@@ -223,7 +223,7 @@ class CommandCSHalfOp : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_HALFOP);
+		notice_help(s_ChanServ, u, CHAN_HELP_HALFOP);
 		return true;
 	}
 };
@@ -249,7 +249,7 @@ class CommandCSDeHalfOp : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_DEHALFOP);
+		notice_help(s_ChanServ, u, CHAN_HELP_DEHALFOP);
 		return true;
 	}
 };
@@ -275,7 +275,7 @@ class CommandCSProtect : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_PROTECT);
+		notice_help(s_ChanServ, u, CHAN_HELP_PROTECT);
 		return true;
 	}
 };
@@ -302,7 +302,7 @@ class CommandCSDeProtect : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_DEPROTECT);
+		notice_help(s_ChanServ, u, CHAN_HELP_DEPROTECT);
 		return true;
 	}
 };
@@ -356,7 +356,7 @@ class CommandCSOwner : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_OWNER);
+		notice_help(s_ChanServ, u, CHAN_HELP_OWNER);
 		return true;
 	}
 };
@@ -409,7 +409,7 @@ class CommandCSDeOwner : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_DEOWNER);
+		notice_help(s_ChanServ, u, CHAN_HELP_DEOWNER);
 		return true;
 	}
 };
diff --git a/src/core/cs_register.c b/src/core/cs_register.c
index 99f819b43..b632bfa6e 100644
--- a/src/core/cs_register.c
+++ b/src/core/cs_register.c
@@ -144,7 +144,7 @@ class CommandCSRegister : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_REGISTER);
+		notice_help(s_ChanServ, u, CHAN_HELP_REGISTER);
 		return true;
 	}
 
diff --git a/src/core/cs_sendpass.c b/src/core/cs_sendpass.c
index 16990415b..0cfef402b 100644
--- a/src/core/cs_sendpass.c
+++ b/src/core/cs_sendpass.c
@@ -78,7 +78,7 @@ class CommandCSSendPass : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_SENDPASS);
+		notice_help(s_ChanServ, u, CHAN_HELP_SENDPASS);
 		return true;
 	}
 
diff --git a/src/core/cs_set.c b/src/core/cs_set.c
index 669d8012f..33fd52f52 100644
--- a/src/core/cs_set.c
+++ b/src/core/cs_set.c
@@ -652,55 +652,55 @@ class CommandCSSet : public Command
 		{
 			if (is_services_admin(u) || is_services_root(u))
 			{
-				notice_lang(s_ChanServ, u, CHAN_SERVADMIN_HELP_SET);
+				notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_SET);
 			}
 			else
 			{
-				notice_lang(s_ChanServ, u, CHAN_HELP_SET);
+				notice_help(s_ChanServ, u, CHAN_HELP_SET);
 			}
 		}
 		else if (subcommand == "FOUNDER")
-			notice_lang(s_ChanServ, u, CHAN_HELP_SET_FOUNDER);
+			notice_help(s_ChanServ, u, CHAN_HELP_SET_FOUNDER);
 		else if (subcommand == "SUCCESSOR")
-			notice_lang(s_ChanServ, u, CHAN_HELP_SET_SUCCESSOR);
+			notice_help(s_ChanServ, u, CHAN_HELP_SET_SUCCESSOR);
 		else if (subcommand == "PASSWORD")
-			notice_lang(s_ChanServ, u, CHAN_HELP_SET_PASSWORD);
+			notice_help(s_ChanServ, u, CHAN_HELP_SET_PASSWORD);
 		else if (subcommand == "DESC")
-			notice_lang(s_ChanServ, u, CHAN_HELP_SET_DESC);
+			notice_help(s_ChanServ, u, CHAN_HELP_SET_DESC);
 		else if (subcommand == "URL")
-			notice_lang(s_ChanServ, u, CHAN_HELP_SET_URL);
+			notice_help(s_ChanServ, u, CHAN_HELP_SET_URL);
 		else if (subcommand == "EMAIL")
-			notice_lang(s_ChanServ, u, CHAN_HELP_SET_EMAIL);
+			notice_help(s_ChanServ, u, CHAN_HELP_SET_EMAIL);
 		else if (subcommand == "ENTRYMSG")
-			notice_lang(s_ChanServ, u, CHAN_HELP_SET_ENTRYMSG);
+			notice_help(s_ChanServ, u, CHAN_HELP_SET_ENTRYMSG);
 		else if (subcommand == "BANTYPE")
-			notice_lang(s_ChanServ, u, CHAN_HELP_SET_BANTYPE);
+			notice_help(s_ChanServ, u, CHAN_HELP_SET_BANTYPE);
 		else if (subcommand == "PRIVATE")
-			notice_lang(s_ChanServ, u, CHAN_HELP_SET_PRIVATE);
+			notice_help(s_ChanServ, u, CHAN_HELP_SET_PRIVATE);
 		else if (subcommand == "KEEPTOPIC")
-			notice_lang(s_ChanServ, u, CHAN_HELP_SET_KEEPTOPIC);
+			notice_help(s_ChanServ, u, CHAN_HELP_SET_KEEPTOPIC);
 		else if (subcommand == "TOPICLOCK")
-			notice_lang(s_ChanServ, u, CHAN_HELP_SET_TOPICLOCK);
+			notice_help(s_ChanServ, u, CHAN_HELP_SET_TOPICLOCK);
 		else if (subcommand == "MLOCK")
-			notice_lang(s_ChanServ, u, CHAN_HELP_SET_MLOCK);
+			notice_help(s_ChanServ, u, CHAN_HELP_SET_MLOCK);
 		else if (subcommand == "RESTRICTED")
-			notice_lang(s_ChanServ, u, CHAN_HELP_SET_RESTRICTED);
+			notice_help(s_ChanServ, u, CHAN_HELP_SET_RESTRICTED);
 		else if (subcommand == "SECURE")
-			notice_lang(s_ChanServ, u, CHAN_HELP_SET_SECURE);
+			notice_help(s_ChanServ, u, CHAN_HELP_SET_SECURE);
 		else if (subcommand == "SECUREOPS")
-			notice_lang(s_ChanServ, u, CHAN_HELP_SET_SECUREOPS);
+			notice_help(s_ChanServ, u, CHAN_HELP_SET_SECUREOPS);
 		else if (subcommand == "SECUREFOUNDER")
-			notice_lang(s_ChanServ, u, CHAN_HELP_SET_SECUREFOUNDER);
+			notice_help(s_ChanServ, u, CHAN_HELP_SET_SECUREFOUNDER);
 		else if (subcommand == "SIGNKICK")
-			notice_lang(s_ChanServ, u, CHAN_HELP_SET_SIGNKICK);
+			notice_help(s_ChanServ, u, CHAN_HELP_SET_SIGNKICK);
 		else if (subcommand == "OPNOTICE")
-			notice_lang(s_ChanServ, u, CHAN_HELP_SET_OPNOTICE);
+			notice_help(s_ChanServ, u, CHAN_HELP_SET_OPNOTICE);
 		else if (subcommand == "XOP")
-			notice_lang(s_ChanServ, u, CHAN_HELP_SET_XOP);
+			notice_help(s_ChanServ, u, CHAN_HELP_SET_XOP);
 		else if (subcommand == "PEACE")
-			notice_lang(s_ChanServ, u, CHAN_HELP_SET_PEACE);
+			notice_help(s_ChanServ, u, CHAN_HELP_SET_PEACE);
 		else if (subcommand == "NOEXPIRE")
-			notice_lang(s_ChanServ, u, CHAN_SERVADMIN_HELP_SET_NOEXPIRE);
+			notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_SET_NOEXPIRE);
 		return true;
 	}
 
diff --git a/src/core/cs_status.c b/src/core/cs_status.c
index 2d8a94981..ba7f5f8fe 100644
--- a/src/core/cs_status.c
+++ b/src/core/cs_status.c
@@ -55,7 +55,7 @@ class CommandCSStatus : public Command
 		if (!is_services_admin(u))
 			return false;
 
-		notice_lang(s_ChanServ, u, CHAN_SERVADMIN_HELP_STATUS);
+		notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_STATUS);
 		return true;
 	}
 
diff --git a/src/core/cs_suspend.c b/src/core/cs_suspend.c
index 43fab316c..45292821f 100644
--- a/src/core/cs_suspend.c
+++ b/src/core/cs_suspend.c
@@ -109,7 +109,7 @@ class CommandCSSuspend : public Command
 		if (!is_services_oper(u))
 			return false;
 
-		notice_lang(s_ChanServ, u, CHAN_SERVADMIN_HELP_SUSPEND);
+		notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_SUSPEND);
 		return true;
 	}
 
@@ -186,7 +186,7 @@ class CommandCSUnSuspend : public Command
 		if (!is_services_oper(u))
 			return false;
 
-		notice_lang(s_ChanServ, u, CHAN_SERVADMIN_HELP_UNSUSPEND);
+		notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_UNSUSPEND);
 		return true;
 	}
 
diff --git a/src/core/cs_topic.c b/src/core/cs_topic.c
index 0f4be3a0e..cbfdc9828 100644
--- a/src/core/cs_topic.c
+++ b/src/core/cs_topic.c
@@ -73,7 +73,7 @@ class CommandCSTopic : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_TOPIC);
+		notice_help(s_ChanServ, u, CHAN_HELP_TOPIC);
 		return true;
 	}
 
diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c
index 4bf79c03a..569ea3cdc 100644
--- a/src/core/cs_xop.c
+++ b/src/core/cs_xop.c
@@ -456,7 +456,7 @@ class CommandCSAOP : public XOPBase
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_AOP);
+		notice_help(s_ChanServ, u, CHAN_HELP_AOP);
 		return true;
 	}
 
@@ -480,7 +480,7 @@ class CommandCSHOP : public XOPBase
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_HOP);
+		notice_help(s_ChanServ, u, CHAN_HELP_HOP);
 		return true;
 	}
 
@@ -504,7 +504,7 @@ class CommandCSSOP : public XOPBase
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_SOP);
+		notice_help(s_ChanServ, u, CHAN_HELP_SOP);
 		return true;
 	}
 
@@ -528,7 +528,7 @@ class CommandCSVOP : public XOPBase
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_VOP);
+		notice_help(s_ChanServ, u, CHAN_HELP_VOP);
 		return true;
 	}
 
diff --git a/src/core/hs_del.c b/src/core/hs_del.c
index 1057a4d5e..97bb9f07d 100644
--- a/src/core/hs_del.c
+++ b/src/core/hs_del.c
@@ -49,7 +49,7 @@ class CommandHSDel : public Command
 		if (!is_host_remover(u))
 			return false;
 
-		notice_lang(s_HostServ, u, HOST_HELP_DEL);
+		notice_help(s_HostServ, u, HOST_HELP_DEL);
 		return true;
 	}
 
diff --git a/src/core/hs_delall.c b/src/core/hs_delall.c
index 2c749f2a2..60d64639e 100644
--- a/src/core/hs_delall.c
+++ b/src/core/hs_delall.c
@@ -56,7 +56,7 @@ class CommandHSDelAll : public Command
 		if (!is_host_remover(u))
 			return false;
 
-		notice_lang(s_HostServ, u, HOST_HELP_DELALL);
+		notice_help(s_HostServ, u, HOST_HELP_DELALL);
 		return true;
 	}
 
diff --git a/src/core/hs_group.c b/src/core/hs_group.c
index 0d3eb729a..3379c2a1a 100644
--- a/src/core/hs_group.c
+++ b/src/core/hs_group.c
@@ -79,7 +79,7 @@ class CommandHSGroup : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_HostServ, u, HOST_HELP_GROUP);
+		notice_help(s_HostServ, u, HOST_HELP_GROUP);
 		return true;
 	}
 };
diff --git a/src/core/hs_list.c b/src/core/hs_list.c
index 615d3b0c7..21ca61689 100644
--- a/src/core/hs_list.c
+++ b/src/core/hs_list.c
@@ -142,7 +142,7 @@ class CommandHSList : public Command
 		if (!is_services_oper(u))
 			return false;
 
-		notice_lang(s_HostServ, u, HOST_HELP_LIST);
+		notice_help(s_HostServ, u, HOST_HELP_LIST);
 		return true;
 	}
 };
diff --git a/src/core/hs_off.c b/src/core/hs_off.c
index 6ba1d77a8..f44b0e5a9 100644
--- a/src/core/hs_off.c
+++ b/src/core/hs_off.c
@@ -50,7 +50,7 @@ class CommandHSOff : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_HostServ, u, HOST_HELP_OFF);
+		notice_help(s_HostServ, u, HOST_HELP_OFF);
 		return true;
 	}
 };
diff --git a/src/core/hs_on.c b/src/core/hs_on.c
index 3050dee32..9286023b2 100644
--- a/src/core/hs_on.c
+++ b/src/core/hs_on.c
@@ -64,7 +64,7 @@ class CommandHSOn : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_HostServ, u, HOST_HELP_ON);
+		notice_help(s_HostServ, u, HOST_HELP_ON);
 		return true;
 	}
 };
diff --git a/src/core/hs_set.c b/src/core/hs_set.c
index 6364086ce..fd66ca911 100644
--- a/src/core/hs_set.c
+++ b/src/core/hs_set.c
@@ -146,7 +146,7 @@ class CommandHSSet : public Command
 		if (!is_host_setter(u))
 			return false;
 
-		notice_lang(s_HostServ, u, HOST_HELP_SET);
+		notice_help(s_HostServ, u, HOST_HELP_SET);
 		return true;
 	}
 
diff --git a/src/core/hs_setall.c b/src/core/hs_setall.c
index 2567126fe..6811bb7f3 100644
--- a/src/core/hs_setall.c
+++ b/src/core/hs_setall.c
@@ -146,7 +146,7 @@ class CommandHSSetAll : public Command
 		if (!is_host_setter(u))
 			return false;
 
-		notice_lang(s_HostServ, u, HOST_HELP_SETALL);
+		notice_help(s_HostServ, u, HOST_HELP_SETALL);
 		return true;
 	}
 
diff --git a/src/core/ms_cancel.c b/src/core/ms_cancel.c
index 7e569539c..1f24ead6d 100644
--- a/src/core/ms_cancel.c
+++ b/src/core/ms_cancel.c
@@ -61,7 +61,7 @@ class CommandMSCancel : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_MemoServ, u, MEMO_HELP_CANCEL);
+		notice_help(s_MemoServ, u, MEMO_HELP_CANCEL);
 		return true;
 	}
 
diff --git a/src/core/ms_check.c b/src/core/ms_check.c
index 9bee02764..0685cdc79 100644
--- a/src/core/ms_check.c
+++ b/src/core/ms_check.c
@@ -80,7 +80,7 @@ class CommandMSCheck : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_MemoServ, u, MEMO_HELP_CHECK);
+		notice_help(s_MemoServ, u, MEMO_HELP_CHECK);
 		return true;
 	}
 
diff --git a/src/core/ms_del.c b/src/core/ms_del.c
index effb84c4c..7d493bffe 100644
--- a/src/core/ms_del.c
+++ b/src/core/ms_del.c
@@ -144,7 +144,7 @@ class CommandMSDel : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_MemoServ, u, MEMO_HELP_DEL);
+		notice_help(s_MemoServ, u, MEMO_HELP_DEL);
 		return true;
 	}
 
diff --git a/src/core/ms_info.c b/src/core/ms_info.c
index 2b015aca1..2d2ace3ef 100644
--- a/src/core/ms_info.c
+++ b/src/core/ms_info.c
@@ -207,9 +207,9 @@ class CommandMSInfo : public Command
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
 		if (is_services_admin(u))
-			notice_lang(s_MemoServ, u, MEMO_SERVADMIN_HELP_INFO);
+			notice_help(s_MemoServ, u, MEMO_SERVADMIN_HELP_INFO);
 		else
-			notice_lang(s_MemoServ, u, MEMO_HELP_INFO);
+			notice_help(s_MemoServ, u, MEMO_HELP_INFO);
 
 		return true;
 	}
diff --git a/src/core/ms_list.c b/src/core/ms_list.c
index f67c34d57..f3b934c46 100644
--- a/src/core/ms_list.c
+++ b/src/core/ms_list.c
@@ -110,7 +110,7 @@ class CommandMSList : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_MemoServ, u, MEMO_HELP_LIST);
+		notice_help(s_MemoServ, u, MEMO_HELP_LIST);
 		return true;
 	}
 
diff --git a/src/core/ms_read.c b/src/core/ms_read.c
index f33778147..962adf9e4 100644
--- a/src/core/ms_read.c
+++ b/src/core/ms_read.c
@@ -117,7 +117,7 @@ class CommandMSRead : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_MemoServ, u, MEMO_HELP_READ);
+		notice_help(s_MemoServ, u, MEMO_HELP_READ);
 		return true;
 	}
 
diff --git a/src/core/ms_rsend.c b/src/core/ms_rsend.c
index d8ae5782c..9a903264b 100644
--- a/src/core/ms_rsend.c
+++ b/src/core/ms_rsend.c
@@ -73,7 +73,7 @@ class CommandMSRSend : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_MemoServ, u, MEMO_HELP_RSEND);
+		notice_help(s_MemoServ, u, MEMO_HELP_RSEND);
 		return true;
 	}
 
diff --git a/src/core/ms_send.c b/src/core/ms_send.c
index eb0395def..15a3d301c 100644
--- a/src/core/ms_send.c
+++ b/src/core/ms_send.c
@@ -35,7 +35,7 @@ class CommandMSSend : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_MemoServ, u, MEMO_HELP_SEND);
+		notice_help(s_MemoServ, u, MEMO_HELP_SEND);
 		return true;
 	}
 
diff --git a/src/core/ms_sendall.c b/src/core/ms_sendall.c
index f52b8430d..c94a48776 100644
--- a/src/core/ms_sendall.c
+++ b/src/core/ms_sendall.c
@@ -59,7 +59,7 @@ class CommandMSSendAll : public Command
 		if (!is_services_admin(u))
 			return false;
 
-		notice_lang(s_MemoServ, u, MEMO_HELP_SENDALL);
+		notice_help(s_MemoServ, u, MEMO_HELP_SENDALL);
 		return true;
 	}
 
diff --git a/src/core/ms_set.c b/src/core/ms_set.c
index 73e1faf45..9d92c9388 100644
--- a/src/core/ms_set.c
+++ b/src/core/ms_set.c
@@ -237,15 +237,15 @@ class CommandMSSet : public Command
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
 		if (subcommand.empty())
-			notice_lang(s_MemoServ, u, MEMO_HELP_SET);
+			notice_help(s_MemoServ, u, MEMO_HELP_SET);
 		else if (subcommand == "NOTIFY")
-			notice_lang(s_MemoServ, u, MEMO_HELP_SET_NOTIFY);
+			notice_help(s_MemoServ, u, MEMO_HELP_SET_NOTIFY);
 		else if (subcommand == "LIMIT")
 		{
 			if (is_services_oper(u))
-				notice_lang(s_MemoServ, u, MEMO_SERVADMIN_HELP_SET_LIMIT, MSMaxMemos);
+				notice_help(s_MemoServ, u, MEMO_SERVADMIN_HELP_SET_LIMIT, MSMaxMemos);
 			else
-				notice_lang(s_MemoServ, u, MEMO_HELP_SET_LIMIT, MSMaxMemos);
+				notice_help(s_MemoServ, u, MEMO_HELP_SET_LIMIT, MSMaxMemos);
 		}
 
 		return true;
diff --git a/src/core/ms_staff.c b/src/core/ms_staff.c
index 5abf6f6b8..aa1e4a358 100644
--- a/src/core/ms_staff.c
+++ b/src/core/ms_staff.c
@@ -57,7 +57,7 @@ class CommandMSStaff : public Command
 		if (!is_services_oper(u))
 			return false;
 
-		notice_lang(s_MemoServ, u, MEMO_HELP_STAFF);
+		notice_help(s_MemoServ, u, MEMO_HELP_STAFF);
 		return true;
 	}
 
diff --git a/src/core/ns_alist.c b/src/core/ns_alist.c
index f9015c6c0..1d631baa2 100644
--- a/src/core/ns_alist.c
+++ b/src/core/ns_alist.c
@@ -135,9 +135,9 @@ class CommandNSAList : public Command
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
 		if (is_services_admin(u))
-			notice_lang(s_NickServ, u, NICK_SERVADMIN_HELP_ALIST);
+			notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_ALIST);
 		else
-			notice_lang(s_NickServ, u, NICK_HELP_ALIST);
+			notice_help(s_NickServ, u, NICK_HELP_ALIST);
 
 		return true;
 	}
diff --git a/src/core/ns_drop.c b/src/core/ns_drop.c
index 6b1113adc..33488d8f2 100644
--- a/src/core/ns_drop.c
+++ b/src/core/ns_drop.c
@@ -105,9 +105,9 @@ class CommandNSDrop : public Command
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
 		if (is_services_admin(u))
-			notice_lang(s_NickServ, u, NICK_SERVADMIN_HELP_DROP);
+			notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_DROP);
 		else
-			notice_lang(s_NickServ, u, NICK_HELP_DROP);
+			notice_help(s_NickServ, u, NICK_HELP_DROP);
 
 		return true;
 	}
diff --git a/src/core/ns_forbid.c b/src/core/ns_forbid.c
index 8d80df4cf..5e9f396ee 100644
--- a/src/core/ns_forbid.c
+++ b/src/core/ns_forbid.c
@@ -95,7 +95,7 @@ class CommandNSForbid : public Command
 		if (!is_services_admin(u))
 			return false;
 
-		notice_lang(s_NickServ, u, NICK_SERVADMIN_HELP_FORBID);
+		notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_FORBID);
 		return true;
 	}
 
diff --git a/src/core/ns_getemail.c b/src/core/ns_getemail.c
index 2e64b181a..d592e89fb 100644
--- a/src/core/ns_getemail.c
+++ b/src/core/ns_getemail.c
@@ -63,7 +63,7 @@ class CommandNSGetEMail : public Command
 		if (!is_services_admin(u))
 			return false;
 
-		notice_lang(s_NickServ, u, NICK_SERVADMIN_HELP_GETEMAIL);
+		notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_GETEMAIL);
 		return true;
 	}
 
diff --git a/src/core/ns_getpass.c b/src/core/ns_getpass.c
index a348711f8..05373cedb 100644
--- a/src/core/ns_getpass.c
+++ b/src/core/ns_getpass.c
@@ -69,7 +69,7 @@ class CommandNSGetPass : public Command
 		if (!is_services_admin(u))
 			return false;
 
-		notice_lang(s_NickServ, u, NICK_SERVADMIN_HELP_GETPASS);
+		notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_GETPASS);
 		return true;
 	}
 
diff --git a/src/core/ns_ghost.c b/src/core/ns_ghost.c
index a751f8af8..b89d8b2be 100644
--- a/src/core/ns_ghost.c
+++ b/src/core/ns_ghost.c
@@ -78,7 +78,7 @@ class CommandNSGhost : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_NickServ, u, NICK_HELP_GHOST);
+		notice_help(s_NickServ, u, NICK_HELP_GHOST);
 		return true;
 	}
 
diff --git a/src/core/ns_group.c b/src/core/ns_group.c
index 9fb7db9d6..c86f460cd 100644
--- a/src/core/ns_group.c
+++ b/src/core/ns_group.c
@@ -201,7 +201,7 @@ class CommandNSGroup : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_NickServ, u, NICK_HELP_GROUP);
+		notice_help(s_NickServ, u, NICK_HELP_GROUP);
 		return true;
 	}
 
@@ -264,9 +264,9 @@ class CommandNSGList : public Command
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
 		if (is_services_admin(u))
-			notice_lang(s_NickServ, u, NICK_SERVADMIN_HELP_GLIST);
+			notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_GLIST);
 		else
-			notice_lang(s_NickServ, u, NICK_HELP_GLIST);
+			notice_help(s_NickServ, u, NICK_HELP_GLIST);
 
 		return true;
 	}
diff --git a/src/core/ns_identify.c b/src/core/ns_identify.c
index de1a0bc26..5e4fc0939 100644
--- a/src/core/ns_identify.c
+++ b/src/core/ns_identify.c
@@ -120,7 +120,7 @@ class CommandNSIdentify : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_NickServ, u, NICK_HELP_IDENTIFY);
+		notice_help(s_NickServ, u, NICK_HELP_IDENTIFY);
 		return true;
 	}
 
diff --git a/src/core/ns_info.c b/src/core/ns_info.c
index 1e664e35a..89171414f 100644
--- a/src/core/ns_info.c
+++ b/src/core/ns_info.c
@@ -207,9 +207,9 @@ class CommandNSInfo : public Command
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
 		if (is_services_admin(u))
-			notice_lang(s_NickServ, u, NICK_SERVADMIN_HELP_INFO);
+			notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_INFO);
 		else
-			notice_lang(s_NickServ, u, NICK_HELP_INFO);
+			notice_help(s_NickServ, u, NICK_HELP_INFO);
 		return true;
 	}
 
diff --git a/src/core/ns_list.c b/src/core/ns_list.c
index 8e86c4857..b7e1cf772 100644
--- a/src/core/ns_list.c
+++ b/src/core/ns_list.c
@@ -195,9 +195,9 @@ class CommandNSList : public Command
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
 		if (is_services_admin(u))
-			notice_lang(s_NickServ, u, NICK_SERVADMIN_HELP_LIST);
+			notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_LIST);
 		else
-			notice_lang(s_NickServ, u, NICK_HELP_LIST);
+			notice_help(s_NickServ, u, NICK_HELP_LIST);
 
 		return true;
 	}
diff --git a/src/core/ns_logout.c b/src/core/ns_logout.c
index d7c9f1f1f..a8fe171b5 100644
--- a/src/core/ns_logout.c
+++ b/src/core/ns_logout.c
@@ -88,9 +88,9 @@ class CommandNSLogout : public Command
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
 		if (is_services_admin(u))
-			notice_lang(s_NickServ, u, NICK_SERVADMIN_HELP_LOGOUT);
+			notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_LOGOUT);
 		else
-			notice_lang(s_NickServ, u, NICK_HELP_LOGOUT);
+			notice_help(s_NickServ, u, NICK_HELP_LOGOUT);
 
 		return true;
 	}
diff --git a/src/core/ns_register.c b/src/core/ns_register.c
index ed9004586..a02a043c4 100644
--- a/src/core/ns_register.c
+++ b/src/core/ns_register.c
@@ -211,7 +211,7 @@ class CommandNSConfirm : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_NickServ, u, NICK_HELP_CONFIRM);
+		notice_help(s_NickServ, u, NICK_HELP_CONFIRM);
 		return true;
 	}
 };
@@ -369,7 +369,7 @@ class CommandNSRegister : public CommandNSConfirm
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_NickServ, u, NICK_HELP_REGISTER);
+		notice_help(s_NickServ, u, NICK_HELP_REGISTER);
 		return true;
 	}
 
@@ -419,7 +419,7 @@ class CommandNSResend : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_NickServ, u, NICK_HELP_RESEND);
+		notice_help(s_NickServ, u, NICK_HELP_RESEND);
 		return true;
 	}
 };
diff --git a/src/core/ns_saset.c b/src/core/ns_saset.c
index 24860bb6f..0e2a3a3ec 100644
--- a/src/core/ns_saset.c
+++ b/src/core/ns_saset.c
@@ -541,25 +541,39 @@ public:
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		// This needs to change XXX
 		if (!is_services_oper(u))
 			return false;
 
-		notice_lang(s_NickServ, u, NICK_HELP_SASET);
-		notice_lang(s_NickServ, u, NICK_HELP_SASET_DISPLAY);
-		notice_lang(s_NickServ, u, NICK_HELP_SASET_PASSWORD);
-		notice_lang(s_NickServ, u, NICK_HELP_SASET_URL);
-		notice_lang(s_NickServ, u, NICK_HELP_SASET_EMAIL);
-		notice_lang(s_NickServ, u, NICK_HELP_SASET_ICQ);
-		notice_lang(s_NickServ, u, NICK_HELP_SASET_GREET);
-		notice_lang(s_NickServ, u, NICK_HELP_SASET_KILL);
-		notice_lang(s_NickServ, u, NICK_HELP_SASET_SECURE);
-		notice_lang(s_NickServ, u, NICK_HELP_SASET_PRIVATE);
-		notice_lang(s_NickServ, u, NICK_HELP_SASET_MSG);
-		notice_lang(s_NickServ, u, NICK_HELP_SASET_HIDE);
-		notice_lang(s_NickServ, u, NICK_HELP_SASET_NOEXPIRE);
-		notice_lang(s_NickServ, u, NICK_HELP_SASET_AUTOOP);
-		notice_lang(s_NickServ, u, NICK_HELP_SASET_LANGUAGE);
+		if (subcommand.empty())
+			notice_help(s_NickServ, u, NICK_HELP_SASET);
+		else if (subcommand == "DISPLAY")
+			notice_help(s_NickServ, u, NICK_HELP_SASET_DISPLAY);
+		else if (subcommand == "PASSWORD")
+			notice_help(s_NickServ, u, NICK_HELP_SASET_PASSWORD);
+		else if (subcommand == "URL")
+			notice_help(s_NickServ, u, NICK_HELP_SASET_URL);
+		else if (subcommand == "EMAIL")
+			notice_help(s_NickServ, u, NICK_HELP_SASET_EMAIL);
+		else if (subcommand == "ICQ")
+			notice_help(s_NickServ, u, NICK_HELP_SASET_ICQ);
+		else if (subcommand == "GREET")
+			notice_help(s_NickServ, u, NICK_HELP_SASET_GREET);
+		else if (subcommand == "KILL")
+			notice_help(s_NickServ, u, NICK_HELP_SASET_KILL);
+		else if (subcommand == "SECURE")
+			notice_help(s_NickServ, u, NICK_HELP_SASET_SECURE);
+		else if (subcommand == "PRIVATE")
+			notice_help(s_NickServ, u, NICK_HELP_SASET_PRIVATE);
+		else if (subcommand == "MSG")
+			notice_help(s_NickServ, u, NICK_HELP_SASET_MSG);
+		else if (subcommand == "HIDE")
+			notice_help(s_NickServ, u, NICK_HELP_SASET_HIDE);
+		else if (subcommand == "NOEXPIRE")
+			notice_help(s_NickServ, u, NICK_HELP_SASET_NOEXPIRE);
+		else if (subcommand == "AUTOOP")
+			notice_help(s_NickServ, u, NICK_HELP_SASET_AUTOOP);
+		else if (subcommand == "LANGUAGE")
+			notice_help(s_NickServ, u, NICK_HELP_SASET_LANGUAGE);
 
 		return true;
 	}
diff --git a/src/core/ns_sendpass.c b/src/core/ns_sendpass.c
index ed4a7a4cd..7f5e3ee25 100644
--- a/src/core/ns_sendpass.c
+++ b/src/core/ns_sendpass.c
@@ -75,7 +75,7 @@ class CommandNSSendPass : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_NickServ, u, NICK_HELP_SENDPASS);
+		notice_help(s_NickServ, u, NICK_HELP_SENDPASS);
 		return true;
 	}
 
diff --git a/src/core/ns_set.c b/src/core/ns_set.c
index fa034effe..30c171698 100644
--- a/src/core/ns_set.c
+++ b/src/core/ns_set.c
@@ -505,31 +505,31 @@ class CommandNSSet : public Command
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
 		if (subcommand == "DISPLAY")
-			notice_lang(s_NickServ, u, NICK_HELP_SET_DISPLAY);
+			notice_help(s_NickServ, u, NICK_HELP_SET_DISPLAY);
 		else if (subcommand == "PASSWORD")
-			notice_lang(s_NickServ, u, NICK_HELP_SET_PASSWORD);
+			notice_help(s_NickServ, u, NICK_HELP_SET_PASSWORD);
 		else if (subcommand == "URL")
-			notice_lang(s_NickServ, u, NICK_HELP_SET_URL);
+			notice_help(s_NickServ, u, NICK_HELP_SET_URL);
 		else if (subcommand == "EMAIL")
-			notice_lang(s_NickServ, u, NICK_HELP_SET_EMAIL);
+			notice_help(s_NickServ, u, NICK_HELP_SET_EMAIL);
 		else if (subcommand == "ICQ")
-			notice_lang(s_NickServ, u, NICK_HELP_SET_ICQ);
+			notice_help(s_NickServ, u, NICK_HELP_SET_ICQ);
 		else if (subcommand == "GREET")
-			notice_lang(s_NickServ, u, NICK_HELP_SET_GREET);
+			notice_help(s_NickServ, u, NICK_HELP_SET_GREET);
 		else if (subcommand == "KILL")
-			notice_lang(s_NickServ, u, NICK_HELP_SET_KILL);
+			notice_help(s_NickServ, u, NICK_HELP_SET_KILL);
 		else if (subcommand == "SECURE")
-			notice_lang(s_NickServ, u, NICK_HELP_SET_SECURE);
+			notice_help(s_NickServ, u, NICK_HELP_SET_SECURE);
 		else if (subcommand == "PRIVATE")
-			notice_lang(s_NickServ, u, NICK_HELP_SET_PRIVATE);
+			notice_help(s_NickServ, u, NICK_HELP_SET_PRIVATE);
 		else if (subcommand == "MSG")
-			notice_lang(s_NickServ, u, NICK_HELP_SET_MSG);
+			notice_help(s_NickServ, u, NICK_HELP_SET_MSG);
 		else if (subcommand == "HIDE")
-			notice_lang(s_NickServ, u, NICK_HELP_SET_HIDE);
+			notice_help(s_NickServ, u, NICK_HELP_SET_HIDE);
 		else if (subcommand == "AUTOOP")
-			notice_lang(s_NickServ, u, NICK_HELP_SET_AUTOOP);
+			notice_help(s_NickServ, u, NICK_HELP_SET_AUTOOP);
 		else
-			notice_lang(s_NickServ, u, NICK_HELP_SET);
+			notice_help(s_NickServ, u, NICK_HELP_SET);
 
 		return true;
 	}
diff --git a/src/core/ns_status.c b/src/core/ns_status.c
index 1db7c7ce5..b62bb1f26 100644
--- a/src/core/ns_status.c
+++ b/src/core/ns_status.c
@@ -57,7 +57,7 @@ class CommandNSStatus : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_NickServ, u, NICK_HELP_STATUS);
+		notice_help(s_NickServ, u, NICK_HELP_STATUS);
 		return true;
 	}
 };
diff --git a/src/core/ns_suspend.c b/src/core/ns_suspend.c
index 947921ac7..1beb525c2 100644
--- a/src/core/ns_suspend.c
+++ b/src/core/ns_suspend.c
@@ -91,7 +91,7 @@ class CommandNSSuspend : public Command
 		if (!is_services_oper(u))
 			return false;
 
-		notice_lang(s_NickServ, u, NICK_SERVADMIN_HELP_SUSPEND);
+		notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_SUSPEND);
 		return true;
 	}
 
@@ -161,7 +161,7 @@ class CommandNSUnSuspend : public Command
 		if (!is_services_oper(u))
 			return false;
 
-		notice_lang(s_NickServ, u, NICK_SERVADMIN_HELP_UNSUSPEND);
+		notice_help(s_NickServ, u, NICK_SERVADMIN_HELP_UNSUSPEND);
 		return true;
 	}
 
diff --git a/src/core/ns_update.c b/src/core/ns_update.c
index d450c05d0..9eca8daad 100644
--- a/src/core/ns_update.c
+++ b/src/core/ns_update.c
@@ -48,7 +48,7 @@ class CommandNSUpdate : public Command
 
 	bool OnHelp(User *u, const std::string &)
 	{
-		notice_lang(s_NickServ, u, NICK_HELP_UPDATE);
+		notice_help(s_NickServ, u, NICK_HELP_UPDATE);
 		return true;
 	}
 };
diff --git a/src/core/os_admin.c b/src/core/os_admin.c
index 21593d7b7..06391e498 100644
--- a/src/core/os_admin.c
+++ b/src/core/os_admin.c
@@ -215,7 +215,6 @@ class CommandOSAdmin : public Command
  public:
 	CommandOSAdmin() : Command("ADMIN", 1, 2)
 	{
-		this->help_param1 = s_NickServ;
 	}
 
 	CommandReturn Execute(User *u, std::vector<std::string> &params)
@@ -237,7 +236,7 @@ class CommandOSAdmin : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_OperServ, u, OPER_HELP_ADMIN);
+		notice_help(s_OperServ, u, OPER_HELP_ADMIN, s_NickServ);
 		return true;
 	}
 
diff --git a/src/core/os_akill.c b/src/core/os_akill.c
index 34ee062a1..795d42328 100644
--- a/src/core/os_akill.c
+++ b/src/core/os_akill.c
@@ -315,7 +315,7 @@ class CommandOSAKill : public Command
 		if (!is_services_oper(u))
 			return false;
 
-		notice_lang(s_OperServ, u, OPER_HELP_AKILL);
+		notice_help(s_OperServ, u, OPER_HELP_AKILL);
 		return true;
 	}
 
diff --git a/src/core/os_chankill.c b/src/core/os_chankill.c
index b72e3f2c8..bb6437931 100644
--- a/src/core/os_chankill.c
+++ b/src/core/os_chankill.c
@@ -93,7 +93,7 @@ class CommandOSChanKill : public Command
 		if (!is_services_admin(u))
 			return false;
 
-		notice_lang(s_OperServ, u, OPER_HELP_CHANKILL);
+		notice_help(s_OperServ, u, OPER_HELP_CHANKILL);
 		return true;
 	}
 
diff --git a/src/core/os_chanlist.c b/src/core/os_chanlist.c
index 922653627..d86beaeed 100644
--- a/src/core/os_chanlist.c
+++ b/src/core/os_chanlist.c
@@ -77,7 +77,7 @@ class CommandOSChanList : public Command
 		if (!is_services_oper(u))
 			return false;
 
-		notice_lang(s_OperServ, u, OPER_HELP_CHANLIST);
+		notice_help(s_OperServ, u, OPER_HELP_CHANLIST);
 		return true;
 	}
 };
diff --git a/src/core/os_clearmodes.c b/src/core/os_clearmodes.c
index 429570b67..379299179 100644
--- a/src/core/os_clearmodes.c
+++ b/src/core/os_clearmodes.c
@@ -238,7 +238,7 @@ class CommandOSClearModes : public Command
 		if (!is_services_oper(u))
 			return false;
 
-		notice_lang(s_OperServ, u, OPER_HELP_CLEARMODES);
+		notice_help(s_OperServ, u, OPER_HELP_CLEARMODES);
 		return true;
 	}
 
diff --git a/src/core/os_defcon.c b/src/core/os_defcon.c
index 484535972..fe533aada 100644
--- a/src/core/os_defcon.c
+++ b/src/core/os_defcon.c
@@ -81,7 +81,7 @@ class CommandOSDEFCON : public Command
 		if (!is_services_admin(u))
 			return false;
 
-		notice_lang(s_OperServ, u, OPER_HELP_DEFCON);
+		notice_help(s_OperServ, u, OPER_HELP_DEFCON);
 		return true;
 	}
 
diff --git a/src/core/os_global.c b/src/core/os_global.c
index 9dc8f44ec..09e4062d6 100644
--- a/src/core/os_global.c
+++ b/src/core/os_global.c
@@ -22,7 +22,6 @@ class CommandOSGlobal : public Command
  public:
 	CommandOSGlobal() : Command("GLOBAL", 1, 1)
 	{
-		this->help_param1 = s_GlobalNoticer;
 	}
 
 	CommandReturn Execute(User *u, std::vector<std::string> &params)
@@ -40,7 +39,7 @@ class CommandOSGlobal : public Command
 		if (!is_services_admin(u))
 			return false;
 
-		notice_lang(s_OperServ, u, OPER_HELP_GLOBAL);
+		notice_help(s_OperServ, u, OPER_HELP_GLOBAL, s_GlobalNoticer);
 		return true;
 	}
 
diff --git a/src/core/os_ignore.c b/src/core/os_ignore.c
index b95e7c843..a278b9499 100644
--- a/src/core/os_ignore.c
+++ b/src/core/os_ignore.c
@@ -125,7 +125,7 @@ class CommandOSIgnore : public Command
 		if (!is_services_admin(u))
 			return false;
 
-		notice_lang(s_OperServ, u, OPER_HELP_IGNORE);
+		notice_help(s_OperServ, u, OPER_HELP_IGNORE);
 		return true;
 	}
 
diff --git a/src/core/os_jupe.c b/src/core/os_jupe.c
index e288887a4..0a8e80a4f 100644
--- a/src/core/os_jupe.c
+++ b/src/core/os_jupe.c
@@ -50,7 +50,7 @@ class CommandOSJupe : public Command
 		if (!is_services_admin(u))
 			return false;
 
-		notice_lang(s_OperServ, u, OPER_HELP_JUPE);
+		notice_help(s_OperServ, u, OPER_HELP_JUPE);
 		return true;
 	}
 
diff --git a/src/core/os_kick.c b/src/core/os_kick.c
index c332f98c4..e815f9fc6 100644
--- a/src/core/os_kick.c
+++ b/src/core/os_kick.c
@@ -58,7 +58,7 @@ class CommandOSKick : public Command
 		if (!is_services_oper(u))
 			return false;
 
-		notice_lang(s_OperServ, u, OPER_HELP_KICK);
+		notice_help(s_OperServ, u, OPER_HELP_KICK);
 		return true;
 	}
 
diff --git a/src/core/os_mode.c b/src/core/os_mode.c
index a09d2bf01..7dc291bb1 100644
--- a/src/core/os_mode.c
+++ b/src/core/os_mode.c
@@ -56,7 +56,7 @@ class CommandOSMode : public Command
 		if (!is_services_oper(u))
 			return false;
 
-		notice_lang(s_OperServ, u, OPER_HELP_MODE);
+		notice_help(s_OperServ, u, OPER_HELP_MODE);
 		return true;
 	}
 
diff --git a/src/core/os_modinfo.c b/src/core/os_modinfo.c
index bdb730ee1..a1a0694e6 100644
--- a/src/core/os_modinfo.c
+++ b/src/core/os_modinfo.c
@@ -57,7 +57,7 @@ class CommandOSModInfo : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_OperServ, u, OPER_HELP_MODINFO);
+		notice_help(s_OperServ, u, OPER_HELP_MODINFO);
 		return true;
 	}
 
diff --git a/src/core/os_modlist.c b/src/core/os_modlist.c
index 62b16006b..eec8bfdbf 100644
--- a/src/core/os_modlist.c
+++ b/src/core/os_modlist.c
@@ -165,7 +165,7 @@ class CommandOSModList : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_OperServ, u, OPER_HELP_MODLIST);
+		notice_help(s_OperServ, u, OPER_HELP_MODLIST);
 		return true;
 	}
 };
diff --git a/src/core/os_modload.c b/src/core/os_modload.c
index 328d89412..3f8166c83 100644
--- a/src/core/os_modload.c
+++ b/src/core/os_modload.c
@@ -49,7 +49,7 @@ class CommandOSModLoad : public Command
 		if (!is_services_root(u))
 			return false;
 
-		notice_lang(s_OperServ, u, OPER_HELP_MODLOAD);
+		notice_help(s_OperServ, u, OPER_HELP_MODLOAD);
 		return true;
 	}
 
@@ -67,6 +67,7 @@ class OSModLoad : public Module
 		this->SetAuthor("Anope");
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
+		this->SetPermanent(true);
 
 		this->AddCommand(OPERSERV, new CommandOSModLoad(), MOD_UNIQUE);
 
diff --git a/src/core/os_modunload.c b/src/core/os_modunload.c
index 58473d969..1906e8884 100644
--- a/src/core/os_modunload.c
+++ b/src/core/os_modunload.c
@@ -51,7 +51,7 @@ class CommandOSModUnLoad : public Command
 		if (!is_services_root(u))
 			return false;
 
-		notice_lang(s_OperServ, u, OPER_HELP_MODUNLOAD);
+		notice_help(s_OperServ, u, OPER_HELP_MODUNLOAD);
 		return true;
 	}
 
diff --git a/src/core/os_news.c b/src/core/os_news.c
index ed3841c93..cc32f8604 100644
--- a/src/core/os_news.c
+++ b/src/core/os_news.c
@@ -271,7 +271,7 @@ class CommandOSLogonNews : public NewsBase
 		if (!is_services_admin(u))
 			return false;
 
-		notice_lang(s_OperServ, u, NEWS_HELP_LOGON);
+		notice_help(s_OperServ, u, NEWS_HELP_LOGON, this->help_param1);
 		return true;
 	}
 
@@ -317,7 +317,7 @@ class CommandOSOperNews : public NewsBase
 		if (!is_services_admin(u))
 			return false;
 
-		notice_lang(s_OperServ, u, NEWS_HELP_OPER);
+		notice_help(s_OperServ, u, NEWS_HELP_OPER, this->help_param1);
 		return true;
 	}
 
@@ -355,7 +355,7 @@ class CommandOSRandomNews : public NewsBase
 		if (!is_services_admin(u))
 			return false;
 
-		notice_lang(s_OperServ, u, NEWS_HELP_RANDOM);
+		notice_help(s_OperServ, u, NEWS_HELP_RANDOM);
 		return true;
 	}
 
diff --git a/src/core/os_noop.c b/src/core/os_noop.c
index e28db7a89..cf1bdf23e 100644
--- a/src/core/os_noop.c
+++ b/src/core/os_noop.c
@@ -66,7 +66,7 @@ class CommandOSNOOP : public Command
 		if (!is_services_admin(u))
 			return false;
 
-		notice_lang(s_OperServ, u, OPER_HELP_NOOP);
+		notice_help(s_OperServ, u, OPER_HELP_NOOP);
 		return true;
 	}
 
diff --git a/src/core/os_oline.c b/src/core/os_oline.c
index c001edbe4..be28f1e57 100644
--- a/src/core/os_oline.c
+++ b/src/core/os_oline.c
@@ -65,7 +65,7 @@ class CommandOSOLine : public Command
 		if (!is_services_root(u))
 			return false;
 
-		notice_lang(s_OperServ, u, OPER_HELP_OLINE);
+		notice_help(s_OperServ, u, OPER_HELP_OLINE);
 		return true;
 	}
 
diff --git a/src/core/os_oper.c b/src/core/os_oper.c
index 6a6ee65cc..bc7031c51 100644
--- a/src/core/os_oper.c
+++ b/src/core/os_oper.c
@@ -222,7 +222,6 @@ class CommandOSOper : public Command
  public:
 	CommandOSOper() : Command("OPER", 1, 2)
 	{
-		this->help_param1 = s_NickServ;
 	}
 
 	CommandReturn Execute(User *u, std::vector<std::string> &params)
@@ -244,7 +243,7 @@ class CommandOSOper : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_OperServ, u, OPER_HELP_OPER);
+		notice_help(s_OperServ, u, OPER_HELP_OPER, s_NickServ);
 		return true;
 	}
 
diff --git a/src/core/os_quit.c b/src/core/os_quit.c
index 58686ed9d..7639ed9de 100644
--- a/src/core/os_quit.c
+++ b/src/core/os_quit.c
@@ -43,7 +43,7 @@ class CommandOSQuit : public Command
 		if (!is_services_root(u))
 			return false;
 
-		notice_lang(s_OperServ, u, OPER_HELP_QUIT);
+		notice_help(s_OperServ, u, OPER_HELP_QUIT);
 		return true;
 	}
 };
diff --git a/src/core/os_reload.c b/src/core/os_reload.c
index 6409ab368..400b61f3e 100644
--- a/src/core/os_reload.c
+++ b/src/core/os_reload.c
@@ -45,7 +45,7 @@ class CommandOSReload : public Command
 		if (!is_services_root(u))
 			return false;
 
-		notice_lang(s_OperServ, u, OPER_HELP_RELOAD);
+		notice_help(s_OperServ, u, OPER_HELP_RELOAD);
 		return true;
 	}
 };
diff --git a/src/core/os_restart.c b/src/core/os_restart.c
index 48ebafb8b..0bfaf7d9c 100644
--- a/src/core/os_restart.c
+++ b/src/core/os_restart.c
@@ -48,7 +48,7 @@ class CommandOSRestart : public Command
 		if (!is_services_root(u))
 			return false;
 
-		notice_lang(s_OperServ, u, OPER_HELP_RESTART);
+		notice_help(s_OperServ, u, OPER_HELP_RESTART);
 		return true;
 	}
 };
diff --git a/src/core/os_session.c b/src/core/os_session.c
index 127cf9058..9e1bf9666 100644
--- a/src/core/os_session.c
+++ b/src/core/os_session.c
@@ -88,7 +88,7 @@ class CommandOSSession : public Command
 		if (!is_services_oper(u))
 			return false;
 
-		notice_lang(s_OperServ, u, OPER_HELP_SESSION);
+		notice_help(s_OperServ, u, OPER_HELP_SESSION);
 		return true;
 	}
 
@@ -449,7 +449,7 @@ class CommandOSException : public Command
 		if (!is_services_oper(u))
 			return false;
 
-		notice_lang(s_OperServ, u, OPER_HELP_EXCEPTION);
+		notice_help(s_OperServ, u, OPER_HELP_EXCEPTION);
 		return true;
 	}
 
diff --git a/src/core/os_set.c b/src/core/os_set.c
index d1ecf843e..c9781e2c9 100644
--- a/src/core/os_set.c
+++ b/src/core/os_set.c
@@ -268,21 +268,21 @@ class CommandOSSet : public Command
 			return false;
 
 		if (subcommand.empty())
-			notice_lang(s_OperServ, u, OPER_HELP_SET);
+			notice_help(s_OperServ, u, OPER_HELP_SET);
 		else if (subcommand == "LIST")
-			notice_lang(s_OperServ, u, OPER_HELP_SET_LIST);
+			notice_help(s_OperServ, u, OPER_HELP_SET_LIST);
 		else if (subcommand == "READONLY")
-			notice_lang(s_OperServ, u, OPER_HELP_SET_READONLY);
+			notice_help(s_OperServ, u, OPER_HELP_SET_READONLY);
 		else if (subcommand == "LOGCHAN")
-			notice_lang(s_OperServ, u, OPER_HELP_SET_LOGCHAN);
+			notice_help(s_OperServ, u, OPER_HELP_SET_LOGCHAN);
 		else if (subcommand == "DEBUG")
-			notice_lang(s_OperServ, u, OPER_HELP_SET_DEBUG);
+			notice_help(s_OperServ, u, OPER_HELP_SET_DEBUG);
 		else if (subcommand == "NOEXPIRE")
-			notice_lang(s_OperServ, u, OPER_HELP_SET_NOEXPIRE);
+			notice_help(s_OperServ, u, OPER_HELP_SET_NOEXPIRE);
 		else if (subcommand == "IGNORE")
-			notice_lang(s_OperServ, u, OPER_HELP_SET_IGNORE);
+			notice_help(s_OperServ, u, OPER_HELP_SET_IGNORE);
 		else if (subcommand == "SUPERADMIN")
-			notice_lang(s_OperServ, u, OPER_HELP_SET_SUPERADMIN);
+			notice_help(s_OperServ, u, OPER_HELP_SET_SUPERADMIN);
 
 		return true;
 	}
diff --git a/src/core/os_sgline.c b/src/core/os_sgline.c
index 71aabe240..efc24acb4 100644
--- a/src/core/os_sgline.c
+++ b/src/core/os_sgline.c
@@ -312,7 +312,7 @@ class CommandOSSGLine : public Command
 		if (!is_services_oper(u))
 			return false;
 
-		notice_lang(s_OperServ, u, OPER_HELP_SGLINE);
+		notice_help(s_OperServ, u, OPER_HELP_SGLINE);
 		return true;
 	}
 
diff --git a/src/core/os_shutdown.c b/src/core/os_shutdown.c
index 0125297bc..a23605f69 100644
--- a/src/core/os_shutdown.c
+++ b/src/core/os_shutdown.c
@@ -44,7 +44,7 @@ class CommandOSShutdown : public Command
 		if (!is_services_root(u))
 			return false;
 
-		notice_lang(s_OperServ, u, OPER_HELP_SHUTDOWN);
+		notice_help(s_OperServ, u, OPER_HELP_SHUTDOWN);
 		return true;
 	}
 };
diff --git a/src/core/os_sqline.c b/src/core/os_sqline.c
index bb75d0e91..af20d4d77 100644
--- a/src/core/os_sqline.c
+++ b/src/core/os_sqline.c
@@ -299,7 +299,7 @@ class CommandOSSQLine : public Command
 		if (!is_services_oper(u))
 			return false;
 
-		notice_lang(s_OperServ, u, OPER_HELP_SQLINE);
+		notice_help(s_OperServ, u, OPER_HELP_SQLINE);
 		return true;
 	}
 
diff --git a/src/core/os_staff.c b/src/core/os_staff.c
index a785ba7ef..365db9da7 100644
--- a/src/core/os_staff.c
+++ b/src/core/os_staff.c
@@ -70,7 +70,7 @@ class CommandOSStaff : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_OperServ, u, OPER_HELP_STAFF);
+		notice_help(s_OperServ, u, OPER_HELP_STAFF);
 		return true;
 	}
 };
diff --git a/src/core/os_stats.c b/src/core/os_stats.c
index 4c996e793..1adb02528 100644
--- a/src/core/os_stats.c
+++ b/src/core/os_stats.c
@@ -313,7 +313,7 @@ class CommandOSStats : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_OperServ, u, OPER_HELP_STATS);
+		notice_help(s_OperServ, u, OPER_HELP_STATS);
 		return true;
 	}
 };
diff --git a/src/core/os_svsnick.c b/src/core/os_svsnick.c
index fcb72da07..9d81830a3 100644
--- a/src/core/os_svsnick.c
+++ b/src/core/os_svsnick.c
@@ -83,7 +83,7 @@ class CommandOSSVSNick : public Command
 		if (!is_services_root(u))
 			return false;
 
-		notice_lang(s_OperServ, u, OPER_HELP_SVSNICK);
+		notice_help(s_OperServ, u, OPER_HELP_SVSNICK);
 		return true;
 	}
 
diff --git a/src/core/os_szline.c b/src/core/os_szline.c
index b3b86736d..a2d442f7b 100644
--- a/src/core/os_szline.c
+++ b/src/core/os_szline.c
@@ -298,7 +298,7 @@ class CommandOSSZLine : public Command
 		if (!is_services_oper(u))
 			return false;
 
-		notice_lang(s_OperServ, u, OPER_HELP_SZLINE);
+		notice_help(s_OperServ, u, OPER_HELP_SZLINE);
 		return true;
 	}
 
diff --git a/src/core/os_umode.c b/src/core/os_umode.c
index e3701ee3d..5575715be 100644
--- a/src/core/os_umode.c
+++ b/src/core/os_umode.c
@@ -69,7 +69,7 @@ class CommandOSUMode : public Command
 		if (!is_services_root(u))
 			return false;
 
-		notice_lang(s_OperServ, u, OPER_HELP_UMODE);
+		notice_help(s_OperServ, u, OPER_HELP_UMODE);
 		return true;
 	}
 
diff --git a/src/core/os_update.c b/src/core/os_update.c
index e59d2f47f..d50d510ed 100644
--- a/src/core/os_update.c
+++ b/src/core/os_update.c
@@ -36,7 +36,7 @@ class CommandOSUpdate : public Command
 		if (!is_services_root(u))
 			return false;
 
-		notice_lang(s_OperServ, u, OPER_HELP_UPDATE);
+		notice_help(s_OperServ, u, OPER_HELP_UPDATE);
 		return true;
 	}
 };
diff --git a/src/core/os_userlist.c b/src/core/os_userlist.c
index 788954126..7d85e641c 100644
--- a/src/core/os_userlist.c
+++ b/src/core/os_userlist.c
@@ -79,7 +79,7 @@ class CommandOSUserList : public Command
 
 	bool OnHelp(User *u, const std::string &subcommand)
 	{
-		notice_lang(s_OperServ, u, OPER_HELP_USERLIST);
+		notice_help(s_OperServ, u, OPER_HELP_USERLIST);
 		return true;
 	}
 };