correct overriden option of button and add checkbox overriden option
correct overriden option of button and add checkbox overriden option
document overriden options of checkbox
document overriden options of choice field
Some additional tweaks and probably some merge conflict fixes
Removing an extra line thanks to @xabbuh
minor #3506 Nykopol overriden options (weaverryan)

This PR was merged into the 2.3 branch.

Discussion
----------

Nykopol overriden options

See #3417 - this is just a rebase to continue it :)

| Q             | A
| ------------- | ---
| Doc fix?      | no
| New docs?     | yes
| Applies to    | 2.3
| Fixed tickets | #3412

Thanks!

Commits
-------

e574e97 Removing an extra line thanks to @xabbuh
4f6cb9d Some additional tweaks and probably some merge conflict fixes
362c8b4 document overriden options of choice field
70feefd document overriden options of checkbox
c62cd13 correct overriden option of button and add checkbox overriden option
ab4aafe correct overriden option of button and add checkbox overriden option