Improve GenerateCLIDocsTable

Will change to Spark program in a later PR.