[ci skip] Manually apply an improved version of PR #3034 (doc fixes)