Merge pull request #16489 from tomkadwill/updating_options_to_new_style

[ci skip] Updated where scope documentation to conform to new style