Some doc fixes for bug #7899.