Issue #14202: some additional doc fixes