Issue #12947: Merge doctest documentation improvements from 3.3.