Fix more typos
Restore old branch tracking configuration syntax

Also add explanation about synonymous options

This reverts commit d1ee3be5516a129a5fe424a8b7e48789fcd57d1e.