Merge pull request #3677 from cpcloud/option-syntax-enh-3667

ENH: enhance set_option syntax
DOC: api.rst updates
DOC: v0.11.1 editing