Merge branch 'jc/how-to-document-api' into maint