Tweak the command line docs, checkin updates from last version