manpage/conf: Bring in DragonFly changes

This is basically a test commit.