[cvs-nhc98] Merge documentation updates back into stable-1-06-branch.