WIP doc followup: missing deprecations

This is WIP because it will have a merge conflict with #6227.