Fixed some style bugs while I'm here (don't override the (correct) default for MAN1).
which included commits to RCS files with non-trunk default branches.