Sylvia/documentation/bld 630

@mhoeber Please review and merge.