Merge branch 'ciao_cli_fixes' into 'master'

Ciao cli fixes

Minor fixups: most of these got changed (months?!) ago, but a few appear to have persisted.

See merge request !118

source/ciao-cluster-setup.rst

@@ -414,24 +414,24 @@ As a valid user, the `ciao-cli`tool allows you to start a workload.
 
 First, you may want to know which workloads are available::
 
-  $ ciao-cli -list-workloads
+  $ ciao-cli workload list
 
 Then you can launch one or more workloads::
 
-  $ ciao-cli -launch-instances -workload <workload UUID> -instances <number of instances to launch>
+  $ ciao-cli instance add -workload <workload UUID> -instances <number of instances to launch>
 
 And you can monitor all your instances statuses (``pending`` or ``running``)::
 
-  $ ciao-cli -list-instances
+  $ ciao-cli instance list
 
 Performance data can be obtained (optionally) by adding a specific label
 to all your instances::
 
-  $ ciao-cli -launch-instances -instance-label <instance-label> -workload <workload UUID> -instances <number of instances to launch>
+  $ ciao-cli instance add -label <instance-label> -workload <workload UUID> -instances <number of instances to launch>
 
 And eventually fetch the performance data::
 
-  $ ciao-cli -dump-label <instance-label>
+  $ ciao-cli trace show -label <instance-label>
 
 You will also see activity related to this launch across your cluster
 components if you have consoles open and logging to standard output as
@@ -543,4 +543,4 @@ testing.
 .. _CNCI Agent: https://github.com/01org/ciao/tree/master/networking/cnci_agent
 .. _mailing list: https://lists.clearlinux.org/mailman/listinfo/ciao-devel
 .. _ciao-cli: https://github.com/01org/ciao/tree/master/ciao-cli
-.. _ciao-webui: https://github.com/01org/ciao-webui
+.. _ciao-webui: https://github.com/01org/ciao-webui