diff --git a/src/cli/command_parser.rb b/src/cli/command_parser.rb
index 0152b1c4f9..9bfbfb576b 100755
--- a/src/cli/command_parser.rb
+++ b/src/cli/command_parser.rb
@@ -72,7 +72,11 @@ module CommandParser
         end
 
         def usage(str)
-            @usage = "Usage: #{str}"
+            @usage=<<EOT
+## SYNOPSIS
+
+#{str}
+EOT
         end
 
         def version(str)
@@ -185,7 +189,7 @@ module CommandParser
             print_formatters
             puts
             if @version
-                puts "== LICENSE"
+                puts "## LICENSE"
                 puts @version
             end
         end
@@ -193,7 +197,7 @@ module CommandParser
         private
 
         def print_options
-            puts "== Options"
+            puts "## OPTIONS"
 
             shown_opts = Array.new
             opt_format = "#{' '*5}%-25s %s"
@@ -217,7 +221,7 @@ module CommandParser
         end
 
         def print_commands
-            puts "== Commands"
+            puts "## COMMANDS"
 
             cmd_format5 =  "#{' '*3}%s"
             cmd_format10 =  "#{' '*8}%s"
@@ -243,7 +247,7 @@ module CommandParser
                     opts_str=value[:options].flatten.collect{|o|
                         o[:name]
                     }.join(', ')
-                    printf cmd_format10, "options: #{opts_str}"
+                    printf cmd_format10, "valid options: #{opts_str}"
                     puts
                 end
                 puts
@@ -251,7 +255,7 @@ module CommandParser
         end
 
         def print_formatters
-            puts "== Argument formats"
+            puts "## ARGUMENT FORMATS"
 
             cmd_format5 =  "#{' '*3}%s"
             cmd_format10 =  "#{' '*8}%s"
diff --git a/src/cli/oneacl b/src/cli/oneacl
index f34ae18240..2be7bb3c0b 100755
--- a/src/cli/oneacl
+++ b/src/cli/oneacl
@@ -31,7 +31,7 @@ require 'command_parser'
 require 'one_helper/oneacl_helper'
 
 cmd = CommandParser::CmdParser.new(ARGV) do
-    usage "oneacl COMMAND [args..] [options..]"
+    usage "`oneacl` <command> [<args>] [<options>]"
     version OpenNebulaHelper::ONE_VERSION
     
     helper = OneAclHelper.new
diff --git a/src/cli/onegroup b/src/cli/onegroup
index 14622a2790..3e00268846 100755
--- a/src/cli/onegroup
+++ b/src/cli/onegroup
@@ -31,7 +31,7 @@ require 'command_parser'
 require 'one_helper/onegroup_helper'
 
 cmd=CommandParser::CmdParser.new(ARGV) do
-    usage "onegroup COMMAND [args..] [options..]"
+    usage "`onegroup` <command> [<args>] [<options>]"
     version OpenNebulaHelper::ONE_VERSION
 
     helper = OneGroupHelper.new
diff --git a/src/cli/onehost b/src/cli/onehost
index 8f28d75c8f..6f7b5f5c81 100755
--- a/src/cli/onehost
+++ b/src/cli/onehost
@@ -31,7 +31,7 @@ require 'command_parser'
 require 'one_helper/onehost_helper'
 
 cmd=CommandParser::CmdParser.new(ARGV) do
-    usage "onehost COMMAND [args..] [options..]"
+    usage "`onehost` <command> [<args>] [<options>]"
     version OpenNebulaHelper::ONE_VERSION
 
     helper = OneHostHelper.new
diff --git a/src/cli/oneimage b/src/cli/oneimage
index 7459f31118..0fc9711bbf 100755
--- a/src/cli/oneimage
+++ b/src/cli/oneimage
@@ -31,7 +31,7 @@ require 'command_parser'
 require 'one_helper/oneimage_helper'
 
 cmd=CommandParser::CmdParser.new(ARGV) do
-    usage "oneimage COMMAND [args..] [options..]"
+    usage "`oneimage` <command> [<args>] [<options>]"
     version OpenNebulaHelper::ONE_VERSION
 
     helper = OneImageHelper.new
diff --git a/src/cli/onetemplate b/src/cli/onetemplate
index 20fb6075b1..041d187887 100755
--- a/src/cli/onetemplate
+++ b/src/cli/onetemplate
@@ -31,7 +31,7 @@ require 'command_parser'
 require 'one_helper/onetemplate_helper'
 
 cmd=CommandParser::CmdParser.new(ARGV) do
-    usage "onetemplate COMMAND [args..] [options..]"
+    usage "`onetemplate` <command> [<args>] [<options>]"
     version OpenNebulaHelper::ONE_VERSION
 
     helper = OneTemplateHelper.new
diff --git a/src/cli/oneuser b/src/cli/oneuser
index 81d7639fc4..8de7f43b23 100755
--- a/src/cli/oneuser
+++ b/src/cli/oneuser
@@ -31,7 +31,7 @@ require 'command_parser'
 require 'one_helper/oneuser_helper'
 
 cmd=CommandParser::CmdParser.new(ARGV) do
-    usage "oneuser COMMAND [args..] [options..]"
+    usage "`oneuser` <command> [<args>] [<options>]"
     version OpenNebulaHelper::ONE_VERSION
 
     helper = OneUserHelper.new
diff --git a/src/cli/onevm b/src/cli/onevm
index 0174edae29..ea7d24cd91 100755
--- a/src/cli/onevm
+++ b/src/cli/onevm
@@ -31,7 +31,7 @@ require 'command_parser'
 require 'one_helper/onevm_helper'
 
 cmd=CommandParser::CmdParser.new(ARGV) do
-    usage "onevm COMMAND [args..] [options..]"
+    usage "`onevm` <command> [<args>] [<options>]"
     version OpenNebulaHelper::ONE_VERSION
 
     helper = OneVMHelper.new
diff --git a/src/cli/onevnet b/src/cli/onevnet
index 2a4c30517f..d5c9e0e5c7 100755
--- a/src/cli/onevnet
+++ b/src/cli/onevnet
@@ -31,7 +31,7 @@ require 'command_parser'
 require 'one_helper/onevnet_helper'
 
 cmd=CommandParser::CmdParser.new(ARGV) do
-    usage "onevnet COMMAND [args..] [options..]"
+    usage "`onevnet` <command> [<args>] [<options>]"
     version OpenNebulaHelper::ONE_VERSION
 
     helper = OneVNetHelper.new