There seem to be a conflict, please backport manually

Is there a description somewhere how to do a manual backport?

https://matplotlib.org/devdocs/devel/coding_guide.html#backports

Manually backported to v2.2.2-doc
68beb9a

For the future, the-doc branch is only for .rst file changes.

Ok, should I backport it to 2.2.x as well or is it tolerable as it is now this one time?

v2.2.2-doc will be merged into v2.2.x, so there's no need to do any more cherry-picking.

This should not have been backported to -doc, I am going to revert that commit.

To build the published docs you install the stable version and then build the docs from the -doc branch so these changes will not reflected in the built docs (seehttps://matplotlib.org//devel/release_guide.html#build-and-deploy-documentation).

Sorry for not being clearer about this.

Given the discussion at#10822 I am not sure if we want to be backporting docstring changes to 2.2.x.

Reverted ina8ac10d

Since the 2.2.x release will probably be the last one for Python 2, it will be around for some time, even after 3.0 is out. I would welcome backporting docstring improvements there.