[Manual backport] Backport doctest fix to 2.x

[Swiddis]

Description

Not sure why so much documentation is merge conflicting, but here we are. Backports #3053

Related Issues

N/A

Check List

• [ ] New functionality includes testing.
• [ ] New functionality has been documented.
  • [ ] New functionality has javadoc added.
  • [ ] New functionality has a user manual doc added.
• [ ] API changes companion pull request created.
• [X] Commits are signed per the DCO using --signoff.
• [ ] Public documentation issue/PR created.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. For more information on following Developer Certificate of Origin and signing off your commits, please check here.