Updated two links in the (old) documentation
Merge branch 'master' into mixed_clients