Only text re-arrangement and minor text tweaks. Synchronise with Forrest's cli.xconf Long way to go - do it in small stages.
cocoon/trunk/cli.xconf