Continued conversion of the doc templaing commands to the new cli
Continued conversion. Complete enough to be testable.