From 91324fa520e4a1a84b67e5c1dd420079755871ee Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 30 Nov 2016 11:06:04 +0100
Subject: [PATCH] Use common syntax for linphone-daemon commands documentation.

---
 daemon/commands/adaptive-jitter-compensation.cc |  7 +++----
 daemon/commands/answer.cc                       |  2 +-
 daemon/commands/audio-codec-get.cc              |  2 +-
 daemon/commands/audio-codec-move.cc             |  2 +-
 daemon/commands/audio-codec-set.cc              |  2 +-
 daemon/commands/audio-codec-toggle.cc           |  6 +++---
 daemon/commands/audio-stream-start.cc           |  2 +-
 daemon/commands/audio-stream-stats.cc           |  2 +-
 daemon/commands/audio-stream-stop.cc            |  2 +-
 daemon/commands/auth-infos-clear.cc             |  2 +-
 daemon/commands/call-mute.cc                    |  2 +-
 daemon/commands/call-pause.cc                   |  2 +-
 daemon/commands/call-resume.cc                  |  2 +-
 daemon/commands/call-stats.cc                   |  2 +-
 daemon/commands/call-status.cc                  |  2 +-
 daemon/commands/call-transfer.cc                |  2 +-
 daemon/commands/call.cc                         |  2 +-
 daemon/commands/conference.cc                   |  8 ++++----
 daemon/commands/config.cc                       |  6 +++---
 daemon/commands/contact.cc                      |  2 +-
 daemon/commands/dtmf.cc                         |  2 +-
 daemon/commands/firewall-policy.cc              |  3 +--
 daemon/commands/help.cc                         |  2 +-
 daemon/commands/jitterbuffer.cc                 |  8 ++++----
 daemon/commands/msfilter-add-fmtp.cc            |  2 +-
 daemon/commands/netsim.cc                       |  2 +-
 daemon/commands/port.cc                         |  5 ++---
 daemon/commands/ptime.cc                        |  2 +-
 daemon/commands/register-status.cc              |  2 +-
 daemon/commands/register.cc                     |  8 ++++----
 daemon/commands/terminate.cc                    |  2 +-
 daemon/commands/unregister.cc                   |  2 +-
 daemon/commands/video.cc                        | 12 ++++++------
 33 files changed, 54 insertions(+), 57 deletions(-)

diff --git a/daemon/commands/adaptive-jitter-compensation.cc b/daemon/commands/adaptive-jitter-compensation.cc
index 313de6ee4..7bc8670d4 100644
--- a/daemon/commands/adaptive-jitter-compensation.cc
+++ b/daemon/commands/adaptive-jitter-compensation.cc
@@ -67,10 +67,9 @@ void AdaptiveBufferCompensationResponse::outputAdaptiveBufferCompensation(Linpho
 }
 
 AdaptiveBufferCompensationCommand::AdaptiveBufferCompensationCommand() :
-		DaemonCommand("adaptive-jitter-compensation", "adaptive-jitter-compensation [<stream>] [enable|disable]",
-				"Enable or disable adaptive buffer compensation respectively with the 'enable' and 'disable' parameters for the specified stream, "
-				"return the status of the use of adaptive buffer compensation without parameter.\n"
-				"<stream> must be one of these values: audio, video.") {
+		DaemonCommand("adaptive-jitter-compensation", "adaptive-jitter-compensation [audio|video] [enable|disable]",
+			"Enable or disable adaptive buffer compensation respectively with the 'enable' and 'disable' parameters for the specified stream, "
+			"return the status of the use of adaptive buffer compensation without parameter.") {
 	addExample(new DaemonCommandExample("adaptive-jitter-compensation audio",
 						"Status: Ok\n\n"
 						"Audio: enabled"));
diff --git a/daemon/commands/answer.cc b/daemon/commands/answer.cc
index 2c347fd0d..f14b9dcbe 100644
--- a/daemon/commands/answer.cc
+++ b/daemon/commands/answer.cc
@@ -22,7 +22,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 using namespace std;
 
 AnswerCommand::AnswerCommand() :
-		DaemonCommand("answer", "answer <call id>", "Answer an incoming call.") {
+		DaemonCommand("answer", "answer <call_id>", "Answer an incoming call.") {
 	addExample(new DaemonCommandExample("answer 3",
 						"Status: Error\n"
 						"Reason: No call with such id."));
diff --git a/daemon/commands/audio-codec-get.cc b/daemon/commands/audio-codec-get.cc
index c529c8789..7fc11b007 100644
--- a/daemon/commands/audio-codec-get.cc
+++ b/daemon/commands/audio-codec-get.cc
@@ -22,7 +22,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 using namespace std;
 
 AudioCodecGetCommand::AudioCodecGetCommand() :
-		DaemonCommand("audio-codec-get", "audio-codec-get <payload_type_number|mime_type>",
+		DaemonCommand("audio-codec-get", "audio-codec-get <payload_type_number>|<mime_type>",
 				"Get an audio codec if a parameter is given, otherwise return the audio codec list.\n"
 				"<mime_type> is of the form mime/rate/channels, eg. speex/16000/1") {
 	addExample(new DaemonCommandExample("audio-codec-get 9",
diff --git a/daemon/commands/audio-codec-move.cc b/daemon/commands/audio-codec-move.cc
index be2f955e2..4ef301fea 100644
--- a/daemon/commands/audio-codec-move.cc
+++ b/daemon/commands/audio-codec-move.cc
@@ -22,7 +22,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 using namespace std;
 
 AudioCodecMoveCommand::AudioCodecMoveCommand() :
-		DaemonCommand("audio-codec-move", "audio-codec-move <payload_type_number|mime_type> <index>",
+		DaemonCommand("audio-codec-move", "audio-codec-move <payload_type_number>|<mime_type> <index>",
 				"Move a codec to the specified index.\n"
 				"<mime_type> is of the form mime/rate/channels, eg. speex/16000/1") {
 	addExample(new DaemonCommandExample("audio-codec-move 9 1",
diff --git a/daemon/commands/audio-codec-set.cc b/daemon/commands/audio-codec-set.cc
index 65cd09032..dd446a9ac 100644
--- a/daemon/commands/audio-codec-set.cc
+++ b/daemon/commands/audio-codec-set.cc
@@ -28,7 +28,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 using namespace std;
 
 AudioCodecSetCommand::AudioCodecSetCommand() :
-		DaemonCommand("audio-codec-set", "audio-codec-set <payload_type_number|mime_type> <property> <value>",
+		DaemonCommand("audio-codec-set", "audio-codec-set <payload_type_number>|<mime_type> <property> <value>",
 				"Set a property (number, clock_rate, recv_fmtp, send_fmtp, bitrate (in kbps/s)) of a codec. Numbering of payload type is automatically performed at startup, any change will be lost after restart.\n"
 				"<mime_type> is of the form mime/rate/channels, eg. speex/16000/1") {
 	addExample(new DaemonCommandExample("audio-codec-set 9 number 18",
diff --git a/daemon/commands/audio-codec-toggle.cc b/daemon/commands/audio-codec-toggle.cc
index 57deeb882..930387d6f 100644
--- a/daemon/commands/audio-codec-toggle.cc
+++ b/daemon/commands/audio-codec-toggle.cc
@@ -66,7 +66,7 @@ void AudioCodecToggleCommand::exec(Daemon *app, const string& args) {
 }
 
 AudioCodecEnableCommand::AudioCodecEnableCommand() :
-		AudioCodecToggleCommand("audio-codec-enable", "audio-codec-enable <payload_type_number|mime_type|ALL>",
+		AudioCodecToggleCommand("audio-codec-enable", "audio-codec-enable <payload_type_number>|<mime_type>|ALL",
 					"Enable an audio codec.\n"
 					"<mime_type> is of the form mime/rate/channels, eg. speex/16000/1", true) {
 	addExample(new DaemonCommandExample("audio-codec-enable G722/8000/1",
@@ -94,7 +94,7 @@ AudioCodecEnableCommand::AudioCodecEnableCommand() :
 }
 
 AudioCodecDisableCommand::AudioCodecDisableCommand() :
-		AudioCodecToggleCommand("audio-codec-disable", "audio-codec-disable <payload_type_number|mime_type|ALL>",
+		AudioCodecToggleCommand("audio-codec-disable", "audio-codec-disable <payload_type_number>|<mime_type>|ALL",
 					"Disable an audio codec.\n"
 					"<mime_type> is of the form mime/rate/channels, eg. speex/16000/1", false) {
 	addExample(new DaemonCommandExample("audio-codec-disable G722/8000/1",
@@ -119,4 +119,4 @@ AudioCodecDisableCommand::AudioCodecDisableCommand() :
 						"Recv-fmtp: \n"
 						"Send-fmtp: \n"
 						"Enabled: false"));
-}
\ No newline at end of file
+}
diff --git a/daemon/commands/audio-stream-start.cc b/daemon/commands/audio-stream-start.cc
index 3e85cc391..6771bfced 100644
--- a/daemon/commands/audio-stream-start.cc
+++ b/daemon/commands/audio-stream-start.cc
@@ -23,7 +23,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 using namespace std;
 
 AudioStreamStartCommand::AudioStreamStartCommand() :
-		DaemonCommand("audio-stream-start", "audio-stream-start <remote ip> <remote port> <payload type number>", "Start an audio stream.") {
+		DaemonCommand("audio-stream-start", "audio-stream-start <remote_ip> <remote_port> <payload_type_number>", "Start an audio stream.") {
 	addExample(new DaemonCommandExample("audio-stream-start 192.168.1.28 7078 9",
 						"Status: Ok\n\n"
 						"Id: 1"));
diff --git a/daemon/commands/audio-stream-stats.cc b/daemon/commands/audio-stream-stats.cc
index ca663e5d4..4845dbb7b 100644
--- a/daemon/commands/audio-stream-stats.cc
+++ b/daemon/commands/audio-stream-stats.cc
@@ -22,7 +22,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 using namespace std;
 
 AudioStreamStatsCommand::AudioStreamStatsCommand() :
-		DaemonCommand("audio-stream-stats", "audio-stream-stats <stream id>", "Return stats of a given audio stream.") {
+		DaemonCommand("audio-stream-stats", "audio-stream-stats <stream_id>", "Return stats of a given audio stream.") {
 	addExample(new DaemonCommandExample("audio-stream-stats 1",
 						"Status: Ok\n\n"
 						"Audio-ICE state: Not activated\n"
diff --git a/daemon/commands/audio-stream-stop.cc b/daemon/commands/audio-stream-stop.cc
index 2ef0d7559..fdb0208df 100644
--- a/daemon/commands/audio-stream-stop.cc
+++ b/daemon/commands/audio-stream-stop.cc
@@ -22,7 +22,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 using namespace std;
 
 AudioStreamStopCommand::AudioStreamStopCommand() :
-		DaemonCommand("audio-stream-stop", "audio-stream-stop <audio stream id>", "Stop an audio stream.") {
+		DaemonCommand("audio-stream-stop", "audio-stream-stop <stream_id>", "Stop an audio stream.") {
 	addExample(new DaemonCommandExample("audio-stream-stop 1",
 						"Status: Ok"));
 	addExample(new DaemonCommandExample("audio-stream-stop 2",
diff --git a/daemon/commands/auth-infos-clear.cc b/daemon/commands/auth-infos-clear.cc
index 33b938899..89e201bd0 100644
--- a/daemon/commands/auth-infos-clear.cc
+++ b/daemon/commands/auth-infos-clear.cc
@@ -22,7 +22,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 using namespace std;
 
 AuthInfosClearCommand::AuthInfosClearCommand() :
-		DaemonCommand("auth-infos-clear", "auth-infos-clear <auth_infos_id|ALL> ", "Remove auth infos context for the given id, or all.") {
+		DaemonCommand("auth-infos-clear", "auth-infos-clear <auth_infos_id>|ALL", "Remove auth infos context for the given id, or all.") {
 	addExample(new DaemonCommandExample("auth-infos-clear 1",
 						"Status: Ok\n"
 						"Reason: Successfully cleared auth info 1."));
diff --git a/daemon/commands/call-mute.cc b/daemon/commands/call-mute.cc
index 81b41db4a..fafd969e7 100644
--- a/daemon/commands/call-mute.cc
+++ b/daemon/commands/call-mute.cc
@@ -22,7 +22,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 using namespace std;
 
 CallMuteCommand::CallMuteCommand() :
-	DaemonCommand("call-mute", "call-mute 0|1", "mute/unmute the microphone (1 to mute, 0 to unmute). No argument means MUTE.")
+	DaemonCommand("call-mute", "call-mute 0|1", "Mute/unmute the microphone (1 to mute, 0 to unmute). No argument means MUTE.")
 {
 	addExample(new DaemonCommandExample("call-mute 1",
 										"Status: Ok\n\n"
diff --git a/daemon/commands/call-pause.cc b/daemon/commands/call-pause.cc
index 0f2f76808..d7a0abb39 100644
--- a/daemon/commands/call-pause.cc
+++ b/daemon/commands/call-pause.cc
@@ -23,7 +23,7 @@ using namespace std;
 
 CallPauseCommand::CallPauseCommand() :
 	DaemonCommand("call-pause",
-				  "call-pause <call id>",
+				  "call-pause [<call_id>]",
 				  "Pause a call (pause current if no id is specified).")
 {
 	addExample(new DaemonCommandExample("call-pause 1",
diff --git a/daemon/commands/call-resume.cc b/daemon/commands/call-resume.cc
index 79acfb07d..1e0034c39 100644
--- a/daemon/commands/call-resume.cc
+++ b/daemon/commands/call-resume.cc
@@ -22,7 +22,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 using namespace std;
 
 CallResumeCommand::CallResumeCommand():
-	DaemonCommand("call-resume", "call-resume <call id>", "Pause a call (pause current if no id is specified).")
+	DaemonCommand("call-resume", "call-resume [<call_id>]", "Pause a call (pause current if no id is specified).")
 {
 	addExample(new DaemonCommandExample("call-resume 1",
 										"Status: Ok\n\n"
diff --git a/daemon/commands/call-stats.cc b/daemon/commands/call-stats.cc
index bce38c188..7e804ee4c 100644
--- a/daemon/commands/call-stats.cc
+++ b/daemon/commands/call-stats.cc
@@ -22,7 +22,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 using namespace std;
 
 CallStatsCommand::CallStatsCommand() :
-		DaemonCommand("call-stats", "call-stats <call id>", "Return all stats of a call.") {
+		DaemonCommand("call-stats", "call-stats [<call_id>]", "Return all stats of a call.") {
 	addExample(new DaemonCommandExample("call-stats 1",
 						"Status: Ok\n\n"
 						"Audio-ICE state: Not activated\n"
diff --git a/daemon/commands/call-status.cc b/daemon/commands/call-status.cc
index 7e8ac3589..c4e48c691 100644
--- a/daemon/commands/call-status.cc
+++ b/daemon/commands/call-status.cc
@@ -22,7 +22,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 using namespace std;
 
 CallStatusCommand::CallStatusCommand() :
-		DaemonCommand("call-status", "call-status <call id>", "Return status of a call.") {
+		DaemonCommand("call-status", "call-status [<call_id>]", "Return status of a call.") {
 	addExample(new DaemonCommandExample("call-status 1",
 						"Status: Ok\n\n"
 						"State: LinphoneCallStreamsRunning\n"
diff --git a/daemon/commands/call-transfer.cc b/daemon/commands/call-transfer.cc
index c422c843d..13170dac8 100644
--- a/daemon/commands/call-transfer.cc
+++ b/daemon/commands/call-transfer.cc
@@ -23,7 +23,7 @@ using namespace std;
 
 CallTransferCommand::CallTransferCommand() :
 	DaemonCommand("call-transfer",
-				  "call-transfer <call_to_transfer_id> <call_to_transfer_to_id|sip_url_to_transfer_to>",
+				  "call-transfer <call_to_transfer_id> <call_to_transfer_to_id>|<sip_url_to_transfer_to>",
 				  "Transfer a call that you aswered to another party")
 {
 	addExample(new DaemonCommandExample("call-transfer 1 sip:john",
diff --git a/daemon/commands/call.cc b/daemon/commands/call.cc
index 740fa287f..4a793a3a0 100644
--- a/daemon/commands/call.cc
+++ b/daemon/commands/call.cc
@@ -22,7 +22,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 using namespace std;
 
 CallCommand::CallCommand() :
-		DaemonCommand("call", "call <sip address>", "Place a call.") {
+		DaemonCommand("call", "call <sip_address> [--early-media]", "Place a call.") {
 	addExample(new DaemonCommandExample("call daemon-test@sip.linphone.org",
 						"Status: Ok\n\n"
 						"Id: 1"));
diff --git a/daemon/commands/conference.cc b/daemon/commands/conference.cc
index 5b5da8741..a4929f72c 100644
--- a/daemon/commands/conference.cc
+++ b/daemon/commands/conference.cc
@@ -22,13 +22,13 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 using namespace std;
 
 ConferenceCommand::ConferenceCommand() :
-	DaemonCommand("conference", "conference <subcommand> <call id>",
+	DaemonCommand("conference", "conference add|rm|leave|enter <call_id>",
 				  "Create and manage an audio conference.\n"
-				  "Subcommands:\n"
+				  "You can:\n"
 				  "- add   : join the call with id 'call id' into the audio conference. Creates new one if none exists.\n"
-				  "- rm    : remove the call with id 'call id' from the audio conference\n"
+				  "- rm    : remove the call with id 'call id' from the audio conference.\n"
 				  "- leave : temporarily leave the current conference.\n"
-				  "- enter : re-join the conference after leaving it")
+				  "- enter : re-join the conference after leaving it.")
 {
 	addExample(new DaemonCommandExample("conference add 1",
 										"Status: Ok\n\n"
diff --git a/daemon/commands/config.cc b/daemon/commands/config.cc
index 01f73844d..7a59bffbd 100644
--- a/daemon/commands/config.cc
+++ b/daemon/commands/config.cc
@@ -33,9 +33,9 @@ ConfigResponse::ConfigResponse(const string& value) : Response() {
 }
 
 ConfigGetCommand::ConfigGetCommand() :
-		DaemonCommand("config-get", "config section key",
+		DaemonCommand("config-get", "config-get <section> <key>",
 				"Reads a configuration value from linphone's configuration database.") {
-	addExample(new DaemonCommandExample("config rtp symmetric",
+	addExample(new DaemonCommandExample("config-get rtp symmetric",
 						"Status: Ok\n\n"
 						"Value: <unset>"));
 }
@@ -54,7 +54,7 @@ void ConfigGetCommand::exec(Daemon *app, const string& args) {
 
 
 ConfigSetCommand::ConfigSetCommand() :
-		DaemonCommand("config-set", "config section key value",
+		DaemonCommand("config-set", "config-set <section> <key> <value>",
 				"Sets a configuration value into linphone's configuration database.") {
 	addExample(new DaemonCommandExample("config-set rtp symmetric 1",
 						"Status: Ok\n\n"
diff --git a/daemon/commands/contact.cc b/daemon/commands/contact.cc
index a4a13ae24..cfa35454f 100644
--- a/daemon/commands/contact.cc
+++ b/daemon/commands/contact.cc
@@ -22,7 +22,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 using namespace std;
 
 ContactCommand::ContactCommand() :
-		DaemonCommand("contact", "contact sip:<username>@<hostname> or contact username hostname", "Set a contact name.") {
+		DaemonCommand("contact", "contact <sip_address> or contact <username> <hostname>", "Set a contact name.") {
 	addExample(new DaemonCommandExample("contact sip:root@unknown-host",
 						"Status: Ok\n\n"));
 }
diff --git a/daemon/commands/dtmf.cc b/daemon/commands/dtmf.cc
index fac596818..9adbb34c9 100644
--- a/daemon/commands/dtmf.cc
+++ b/daemon/commands/dtmf.cc
@@ -22,7 +22,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 using namespace std;
 
 DtmfCommand::DtmfCommand() :
-		DaemonCommand("dtmf", "dtmf <digit>", "Generate a DTMF (one of: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, A, B, C, D, *, #.") {
+		DaemonCommand("dtmf", "dtmf <digit>", "Generate a DTMF (one of 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, A, B, C, D, *, #).") {
 	addExample(new DaemonCommandExample("dtmf 4",
 						"Status: Ok"));
 	addExample(new DaemonCommandExample("dtmf B",
diff --git a/daemon/commands/firewall-policy.cc b/daemon/commands/firewall-policy.cc
index c5e7e3ba3..a580d73e3 100644
--- a/daemon/commands/firewall-policy.cc
+++ b/daemon/commands/firewall-policy.cc
@@ -54,9 +54,8 @@ FirewallPolicyResponse::FirewallPolicyResponse(LinphoneCore *core) : Response()
 }
 
 FirewallPolicyCommand::FirewallPolicyCommand() :
-		DaemonCommand("firewall-policy", "firewall-policy <type> [<address>]",
+		DaemonCommand("firewall-policy", "firewall-policy [none|nat|stun|ice|upnp] [<address>]",
 				"Set the firewall policy if type is set, otherwise return the used firewall policy.\n"
-				"<type> must be one of these values: none, nat, stun, ice, upnp.\n"
 				"<address> must be specified for the 'nat' and 'stun' types. "
 				"It represents the public address of the gateway for the 'nat' type and the STUN server address for the 'stun' and 'ice' types.") {
 	addExample(new DaemonCommandExample("firewall-policy stun stun.linphone.org",
diff --git a/daemon/commands/help.cc b/daemon/commands/help.cc
index 7d031c570..5c7d62daf 100644
--- a/daemon/commands/help.cc
+++ b/daemon/commands/help.cc
@@ -22,7 +22,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 using namespace std;
 
 HelpCommand::HelpCommand() :
-		DaemonCommand("help", "help <command>", "Show <command> help notice, if command is unspecified or inexistent show all commands.") {
+		DaemonCommand("help", "help [<command>]", "Show <command> help notice, if command is unspecified or inexistent show all commands.") {
 }
 
 void HelpCommand::exec(Daemon *app, const string& args) {
diff --git a/daemon/commands/jitterbuffer.cc b/daemon/commands/jitterbuffer.cc
index aa9690ab0..335f7bdb2 100644
--- a/daemon/commands/jitterbuffer.cc
+++ b/daemon/commands/jitterbuffer.cc
@@ -38,10 +38,10 @@ public:
 };
 
 JitterBufferCommand::JitterBufferCommand() : DaemonCommand("jitter-buffer",
-	"jitter-buffer <stream-type> [size <milliseconds>]" ,
+	"jitter-buffer [audio|video] [size <milliseconds>]",
 	"Control jitter buffer parameters.\n"
-	"jitter-buffer <stream-type> size <milliseconds> : sets the nominal jitter buffer size in milliseconds. Has no effect in a running call.\n"
-	"jitter-buffer <stream-type> : gets the nominal jitter buffer size."
+	"jitter-buffer [audio|video] size <milliseconds>: sets the nominal jitter buffer size in milliseconds. Has no effect in a running call.\n"
+	"jitter-buffer [audio|video]: gets the nominal jitter buffer size."
 	){
 	addExample(new DaemonCommandExample("jitter-buffer","Status: Ok\n\n"
 				"audio-jitter-buffer-size: 60\nvideo-jitter-buffer-size: 60\n"));
@@ -86,7 +86,7 @@ void JitterBufferCommand::exec(Daemon *app, const string& args) {
 }
 
 JitterBufferResetCommand::JitterBufferResetCommand() : DaemonCommand("jitter-buffer-reset",
-	"jitter-buffer-reset [call|stream] id [audio|video]" ,
+	"jitter-buffer-reset call|stream <id> [audio|video]" ,
 	"Reset the RTP jitter buffer for a given call or stream id and stream type."
 	){
 	addExample(new DaemonCommandExample("jitter-buffer-reset call 3 audio",
diff --git a/daemon/commands/msfilter-add-fmtp.cc b/daemon/commands/msfilter-add-fmtp.cc
index 5137963be..afce5a513 100644
--- a/daemon/commands/msfilter-add-fmtp.cc
+++ b/daemon/commands/msfilter-add-fmtp.cc
@@ -24,7 +24,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 using namespace std;
 
 MSFilterAddFmtpCommand::MSFilterAddFmtpCommand() :
-	DaemonCommand("msfilter-add-fmtp", "msfilter-add-fmtp <call/stream> <id> <fmtp>", "Add fmtp to the encoder of a call or a stream") {
+	DaemonCommand("msfilter-add-fmtp", "msfilter-add-fmtp call|stream <id> <fmtp>", "Add fmtp to the encoder of a call or a stream") {
 	addExample(new DaemonCommandExample("msfilter-add-fmtp call 1 vbr=on",
 						"Status: Ok"));
 	addExample(new DaemonCommandExample("msfilter-add-fmtp call 2 vbr=on",
diff --git a/daemon/commands/netsim.cc b/daemon/commands/netsim.cc
index 2d982416e..d2678d188 100644
--- a/daemon/commands/netsim.cc
+++ b/daemon/commands/netsim.cc
@@ -46,7 +46,7 @@ NetsimResponse::NetsimResponse(LinphoneCore *lc) : Response() {
 	setBody(ost.str());
 }
 
-NetsimCommand::NetsimCommand(): DaemonCommand("netsim","netsim [enabled|disabled|parameters <parameters]",
+NetsimCommand::NetsimCommand(): DaemonCommand("netsim","netsim [enable|disable|parameters] [<parameters>]",
 	"Configure the network simulator. Parameters are to be provided in the form param-name=param-value, separated with ';' only. Supported parameters are:\n"
 	"\tmax_bandwidth (kbit/s)\n"
 	"\tmax_buffer_size (bits)\n"
diff --git a/daemon/commands/port.cc b/daemon/commands/port.cc
index 1d47bf094..5c225c731 100644
--- a/daemon/commands/port.cc
+++ b/daemon/commands/port.cc
@@ -87,10 +87,9 @@ void PortResponse::outputVideoRTPPort(LinphoneCore *core, ostringstream &ost) {
 }
 
 PortCommand::PortCommand() :
-		DaemonCommand("port", "port [<type>] [<port>] [<protocol>]",
+		DaemonCommand("port", "port [sip|audio|video] [<port>] [udp|tcp|tls]",
 				"Set the port to use for type if port is set, otherwise return the port used for type if specified or all the used ports if no type is specified.\n"
-				"<type> must be one of these values: sip, audio, video.\n"
-				"<protocol> should be defined only for sip port and have one of these values: udp, tcp, tls.") {
+				"The protocol should be defined only for sip port and have one of these values: udp, tcp, tls.") {
 	addExample(new DaemonCommandExample("port sip 5060 tls",
 						"Status: Ok\n\n"
 						"SIP: 5060 TLS"));
diff --git a/daemon/commands/ptime.cc b/daemon/commands/ptime.cc
index c1dda80a5..6d33490af 100644
--- a/daemon/commands/ptime.cc
+++ b/daemon/commands/ptime.cc
@@ -49,7 +49,7 @@ PtimeResponse::PtimeResponse(LinphoneCore *core, Direction dir) : Response() {
 }
 
 PtimeCommand::PtimeCommand() :
-		DaemonCommand("ptime", "ptime [up|down] <ms>", "Set the upload or download ptime if ms is defined, otherwise return the current value of the ptime.") {
+		DaemonCommand("ptime", "ptime [up|down] [<ms>]", "Set the upload or download ptime if ms is defined, otherwise return the current value of the ptime.") {
 	addExample(new DaemonCommandExample("ptime up 20",
 						"Status: Ok\n\n"
 						"Upload: 20"));
diff --git a/daemon/commands/register-status.cc b/daemon/commands/register-status.cc
index e989083ba..fb4c8a461 100644
--- a/daemon/commands/register-status.cc
+++ b/daemon/commands/register-status.cc
@@ -47,7 +47,7 @@ void RegisterStatusResponse::append(int id, const LinphoneProxyConfig* cfg) {
 }
 
 RegisterStatusCommand::RegisterStatusCommand() :
-		DaemonCommand("register-status", "register-status <register_id|ALL>", "Return status of a registration or of all registrations.") {
+		DaemonCommand("register-status", "register-status <register_id>|ALL", "Return status of a registration or of all registrations.") {
 	addExample(new DaemonCommandExample("register-status 1",
 						"Status: Ok\n\n"
 						"Id: 1\n"
diff --git a/daemon/commands/register.cc b/daemon/commands/register.cc
index b67aa8c25..f267e28da 100644
--- a/daemon/commands/register.cc
+++ b/daemon/commands/register.cc
@@ -27,7 +27,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 using namespace std;
 
 RegisterCommand::RegisterCommand() :
-		DaemonCommand("register", "register <identity> <proxy-address> <password> <userid> <realm>", "Register the daemon to a SIP proxy. If one of the parameters <password>, <userid> and <realm> is not needed, send the string \"NULL\"") {
+		DaemonCommand("register", "register <identity> <proxy_address> [<password>] [<userid>] [<realm>] [<parameter>]", "Register the daemon to a SIP proxy. If one of the parameters <password>, <userid> and <realm> is not needed, send the string \"NULL\"") {
 	addExample(new DaemonCommandExample("register sip:daemon-test@sip.linphone.org sip.linphone.org password bob linphone.org",
 						"Status: Ok\n\n"
 						"Id: 1"));
@@ -61,9 +61,9 @@ void RegisterCommand::exec(Daemon *app, const string& args) {
 	}
 	cidentity = identity.c_str();
 	cproxy = proxy.c_str();
-	if (!password.empty()) cpassword = password.c_str();
-	if (!userid.empty()) cuserid = userid.c_str();
-	if (!realm.empty()) crealm = realm.c_str();
+	if (!password.empty() && (password.compare("NULL") != 0)) cpassword = password.c_str();
+	if (!userid.empty() && (userid.compare("NULL") != 0)) cuserid = userid.c_str();
+	if (!realm.empty() && (realm.compare("NULL") != 0)) crealm = realm.c_str();
 	if (!parameter.empty()) cparameter = parameter.c_str();
 	LinphoneProxyConfig *cfg = linphone_proxy_config_new();
 	if (cpassword != NULL) {
diff --git a/daemon/commands/terminate.cc b/daemon/commands/terminate.cc
index c10acf492..0165ddc98 100644
--- a/daemon/commands/terminate.cc
+++ b/daemon/commands/terminate.cc
@@ -22,7 +22,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 using namespace std;
 
 TerminateCommand::TerminateCommand() :
-		DaemonCommand("terminate", "terminate <call id>", "Terminate a call.") {
+		DaemonCommand("terminate", "terminate [<call_id>]", "Terminate a call.") {
 	addExample(new DaemonCommandExample("terminate 2",
 						"Status: Error\n"
 						"Reason: No call with such id."));
diff --git a/daemon/commands/unregister.cc b/daemon/commands/unregister.cc
index 1aa3daf73..b35ec0455 100644
--- a/daemon/commands/unregister.cc
+++ b/daemon/commands/unregister.cc
@@ -22,7 +22,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 using namespace std;
 
 UnregisterCommand::UnregisterCommand() :
-		DaemonCommand("unregister", "unregister <register_id|ALL>", "Unregister the daemon from the specified proxy or from all proxies.") {
+		DaemonCommand("unregister", "unregister <register_id>|ALL", "Unregister the daemon from the specified proxy or from all proxies.") {
 	addExample(new DaemonCommandExample("unregister 3",
 						"Status: Error\n"
 						"Reason: No register with such id."));
diff --git a/daemon/commands/video.cc b/daemon/commands/video.cc
index c7a5a02a0..c1486ccad 100644
--- a/daemon/commands/video.cc
+++ b/daemon/commands/video.cc
@@ -23,9 +23,9 @@ using namespace std;
 
 Video::Video() :
 	DaemonCommand("video",
-				  "video <call id>",
-				  "Toggles camera on current call."
-				  "If no call is specified, the current call is taken.")
+		"video [call_id]",
+		"Toggles camera on current call."
+		"If no call is specified, the current call is taken.")
 {
 	addExample(new DaemonCommandExample("video 1",
 										"Status: Ok\n\n"
@@ -85,7 +85,7 @@ void Video::exec(Daemon* app, const string& args)
 
 VideoSource::VideoSource():
 	DaemonCommand("videosource",
-				  "videosource <cam|dummy> <call-id>",
+				  "videosource cam|dummy [<call_id>]",
 				  "Toggles camera source for specified call."
 				  "If no call is specified, the current call is taken.")
 {
@@ -150,8 +150,8 @@ void VideoSource::exec(Daemon* app, const string& args)
 
 AutoVideo::AutoVideo():
 	DaemonCommand("autovideo",
-				  "autovideo <on|off>",
-				  "Enables/disables automatic video setup when a call is issued")
+				  "autovideo on|off",
+				  "Enables/disables automatic video setup when a call is issued.")
 {
 	addExample(new DaemonCommandExample("autovideo on",
 										"Status: Ok\n\n"