Merge pull request #2 from fanf2/fanf

Replace RRset syntax and editorial tweaks