website: Fixed semantic meaning of upstream in DNS guide
Fix merge conflict
Merge branch 'pmarkert-semantic'