Merge branch '1.9' of anope.git.sf.net:/gitroot/anope/anope into 1.9

7 files changed, 7 insertions, 1 deletions

diff --git a/modules/core/bs_help.cpp b/modules/core/bs_help.cpp
index f8fc414b5..87e24b4f6 100644
--- a/modules/core/bs_help.cpp
+++ b/modules/core/bs_help.cpp
@@ -20,6 +20,7 @@ class CommandBSHelp : public Command
 	{
 		this->SetFlag(CFLAG_ALLOW_UNREGISTERED);
 		this->SetFlag(CFLAG_STRIP_CHANNEL);
+		this->SetDesc(_("Displays this list and give information about commands"));
 	}
 
 	CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> &params)
diff --git a/modules/core/cs_help.cpp b/modules/core/cs_help.cpp
index 67b2354f9..294a26b62 100644
--- a/modules/core/cs_help.cpp
+++ b/modules/core/cs_help.cpp
@@ -20,6 +20,7 @@ class CommandCSHelp : public Command
 	{
 		this->SetFlag(CFLAG_ALLOW_UNREGISTERED);
 		this->SetFlag(CFLAG_STRIP_CHANNEL);
+		this->SetDesc(_("Displays this list and give information about commands"));
 	}
 
 	CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> &params)
diff --git a/modules/core/hs_help.cpp b/modules/core/hs_help.cpp
index c360376c7..bf96e4d77 100644
--- a/modules/core/hs_help.cpp
+++ b/modules/core/hs_help.cpp
@@ -19,6 +19,7 @@ class CommandHSHelp : public Command
 	CommandHSHelp() : Command("HELP", 1, 1)
 	{
 		this->SetFlag(CFLAG_ALLOW_UNREGISTERED);
+		this->SetDesc(_("Displays this list and give information about commands"));
 	}
 
 	CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> &params)
diff --git a/modules/core/ms_help.cpp b/modules/core/ms_help.cpp
index 54210e4fe..29b70d662 100644
--- a/modules/core/ms_help.cpp
+++ b/modules/core/ms_help.cpp
@@ -19,6 +19,7 @@ class CommandMSHelp : public Command
 	CommandMSHelp() : Command("HELP", 1, 1)
 	{
 		this->SetFlag(CFLAG_ALLOW_UNREGISTERED);
+		this->SetDesc(_("Displays this list and give information about commands"));
 	}
 
 	CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> &params)
diff --git a/modules/core/ns_help.cpp b/modules/core/ns_help.cpp
index 94442606e..e7659a6aa 100644
--- a/modules/core/ns_help.cpp
+++ b/modules/core/ns_help.cpp
@@ -19,6 +19,7 @@ class CommandNSHelp : public Command
 	CommandNSHelp() : Command("HELP", 1, 1)
 	{
 		this->SetFlag(CFLAG_ALLOW_UNREGISTERED);
+		this->SetDesc(_("Displays this list and give information about commands"));
 	}
 
 	CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> &params)
diff --git a/modules/core/ns_register.cpp b/modules/core/ns_register.cpp
index 531933340..6a79c89b1 100644
--- a/modules/core/ns_register.cpp
+++ b/modules/core/ns_register.cpp
@@ -310,7 +310,7 @@ class CommandNSResend : public Command
 	void OnServHelp(CommandSource &source)
 	{
 		if (Config->NSEmailReg)
-			source.Reply(_("Resend the registration passcode"));
+			source.Reply("    %-14s %s", this->name.c_str(),_("Resend the registration passcode"));
 	}
 };
 
diff --git a/modules/core/os_help.cpp b/modules/core/os_help.cpp
index e58eee435..b64a614b9 100644
--- a/modules/core/os_help.cpp
+++ b/modules/core/os_help.cpp
@@ -18,6 +18,7 @@ class CommandOSHelp : public Command
  public:
 	CommandOSHelp() : Command("HELP", 1, 1)
 	{
+		this->SetDesc(_("Displays this list and give information about commands"));
 	}
 
 	CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> &params)