fix referenced documents names
readd configuration block
remove empty_data from the list of inherited options, it's documented in the overriden options section
bug #3544 Fix build errors (xabbuh)

This PR was merged into the master branch.

Discussion
----------

Fix build errors

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.5
| Fixed tickets |

Commits
-------

46e0b52 remove empty_data from the list of inherited options, it's documented in the overriden options section
7e3c0e3 readd configuration block
64602c8 fix referenced documents names