small doc generation fixups
merge from origin