a round of checkdoc fixing