Merge recent fixes (build environment) and first part of man-page updates.