Apply Roland's 29_usermanual.dpatch to fix a bunch