Backport #23664 by @SuperSandro2000 Conflicts fixed by Andrew Thornton <art27@cantab.net> Co-authored-by: Sandro <sandro.jaeckel@gmail.com> Co-authored-by: Andrew Thornton <art27@cantab.net>
backport #23629 To make versioned documentation less surprising, 1.19 should have the same technology.