Clarify merge with diverged docs updates.
requested to merge 4767-address-merge-conflicts-release into 4767-python-package-documentation-versions
Non-critical documentation updates in the main branch will make a
merge from release-2023 to main confusing. This commit attemps to
simplify that upcoming merge.
Refs #4767 (closed)