#786 Adapting documentation generation (2)