Changes to generated docs and their templates.
Handling feedback for PR#2041