From c1439da922859c800b742643395a6038f587b5f9 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Sun, 25 Sep 2016 10:50:38 +0200
Subject: [PATCH] Merge with develop

---
 code/nel/src/misc/cmd_args.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/code/nel/src/misc/cmd_args.cpp b/code/nel/src/misc/cmd_args.cpp
index d9370b831..6ec3fd485 100644
--- a/code/nel/src/misc/cmd_args.cpp
+++ b/code/nel/src/misc/cmd_args.cpp
@@ -418,7 +418,7 @@ void CCmdArgs::displayHelp()
 
 	if (!_Description.empty())
 	{
-		printf("\n%s", _Description.c_str());
+		printf("\n%s\n", _Description.c_str());
 	}
 
 	printf("\nWhere options are:\n");
@@ -443,7 +443,6 @@ void CCmdArgs::displayHelp()
 			if (!arg.helpName.empty())
 			{
 				syntaxes.push_back(toString("-%s <%s>", arg.shortName.c_str(), arg.helpName.c_str()));
-				syntaxes.push_back(toString("-%s<%s>", arg.shortName.c_str(), arg.helpName.c_str()));
 			}
 			else
 			{
@@ -459,12 +458,6 @@ void CCmdArgs::displayHelp()
 				// display first syntax for long argument, --arg <value>
 				syntaxes.push_back(toString("--%s <%s>", arg.longName.c_str(), arg.helpName.c_str()));
 			}
-
-			if (!arg.helpName.empty())
-			{
-				// display second syntax for long argument, --arg=<value>
-				syntaxes.push_back(toString("--%s=<%s>", arg.longName.c_str(), arg.helpName.c_str()));
-			}
 			else
 			{
 				syntaxes.push_back(toString("--%s", arg.longName.c_str()));