Merge in update such that trunk tree no longer commits manpages.