Various doc fixes [6/?]

- I failed a bit on branching, but it seems fixed now.