Continued work on the templates.
Fix conflict between doc recipe and doc directory, now that -f is optional.
Completed @doc-edit-hooks command, and tweaked output formatting.