Merge branch 'jc/doc-long-options' into maint