feat #682 replace `contentMacro` with `macro` in @aria:Dialog

To make API more consistent, let `macro` in @aria:Dialog be a synonym for
`contentMacro`.

`contentMacro` is deprecated from now on.

Close #682. Close #687.