Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

1. Checkout backport branch and update it.

git checkout v3.7.x
git pull

2. Cherry pick the first parent branch of the this PR on top of the older branch:

git cherry-pick -x -m1 1d78f1299945169f3792f0b9fc9b3fe62786feaf

3. You will likely have some merge/cherry-pick conflict here, fix them and commit:

git commit -am 'Backport PR #26257: DOC: Clarify terminology'

4. Push to a named branch:

git push YOURFORK v3.7.x:auto-backport-of-pr-26257-on-v3.7.x

5. Create a PR against branch v3.7.x, I would have named this PR:

"Backport PR #26257 on branch v3.7.x (DOC: Clarify terminology)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

1. Checkout backport branch and update it.

git checkout v3.7.1-doc
git pull

2. Cherry pick the first parent branch of the this PR on top of the older branch:

git cherry-pick -x -m1 1d78f1299945169f3792f0b9fc9b3fe62786feaf

3. You will likely have some merge/cherry-pick conflict here, fix them and commit:

git commit -am 'Backport PR #26257: DOC: Clarify terminology'

4. Push to a named branch:

git push YOURFORK v3.7.1-doc:auto-backport-of-pr-26257-on-v3.7.1-doc

5. Create a PR against branch v3.7.1-doc, I would have named this PR:

"Backport PR #26257 on branch v3.7.1-doc (DOC: Clarify terminology)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.