Make use of @link/@linkplain more consistent
Merge branch 'master' of github.com:afs/quack