Comment 2 for bug 723653

I have spun-off adding a new .. option:: directive to bug #724171. After this the plugin markup can be fixed.
My stuff has all be merged so re-assigned to Marisa for the remaining stuff. Let me know if you want me to take any parts of this.