Doc fixes

Might be an issue here, as there is a rebase within it.
I am reading the docs, so this PR is merely a placeholder.
Tell me if you want me to avoid the rebase stuff ;) I'll comment again when I'll have read the full doc