Undo some of the &man.x.y changes, to appease the Jenkins bot.

Unfortunately, I have no idea how this job finds what man pages are
available, so this is just hit and miss until it shuts up...