These are just mechanical fixes based on the build warnings - I haven't actually checked if these pages are still up to date.
@asamalik It would be good if you could have a quick look at this before merging it
rebased onto f9fa87a5a3822d6d39c5106dab890eb8645065b0
Pull-Request has been merged by ncoghlan