Zanata client help needs to be specific about command argument order

The command zanata-cli --help states the order of arguments such as:

Usage: zanata-cli [[help | init | list-remote | pull | push | put-project | put-user | put-version | stats]] [--batch-mode (-B)] [--debug (-X)] [--errors (-e)] [--help (-h)] [--quiet (-q)] [--version (-v)]

This is incorrect. -X, -e, -B and -q need to be entered before the push/pull/put etc argument, else they will be effectively overridden by local variables. Attempting to get batch mode to operate was almost impossible without knowing this information.
The order should be displayed correctly, and each option should indicate whether it is a global or local option.