Merge "Tidy / regularize shell command help text" into sc-dev