Refactored OptionsResolver docs to have a better example
Merge pull request #2547 from WouterJ/refactor_optionsresolver

Refactored OptionsResolver docs to have a better example
[#2547] Proofreading nice changes by @WouterJ to the OptionsResolver component
Merge branch '2.1' into 2.2