Merge pull request #25063 from thaJeztah/man-page-cherry

cherry-pick manpages fix