Clarifying join language; fixes #546
Merge branch 'master' of github.com:rethinkdb/docs