Remove macro definitions from doc.ddoc that are also in html.ddoc
Forgot some debugging noise
Merge pull request #730 from andralex/reorg1

Remove macro definitions from doc.ddoc that are also in html.ddoc