Docsupport4x
Checklist
-
make -j4 test
(UNIX), orvcbuild test
(Windows) passes -
documentation is changed or added -
commit message follows [commit guidelines][]
Affected core subsystem(s)
doc
First 2 commits are backports of the original changes to master and the updates for v6.x.
The last commit updates for the changes needed for 4.x