Refactored docs to use adders/removers

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | yes
| Applies to    | 2.1+
| Fixed tickets | #1057

This is the first draw to fix this document for 2.1. I have not tested the code yet, that's why I called it a WIP.