CNAPI-478: fix 'make regen_docs' and some TOC improvements