Fix up documentation to match #1986