4 commits

Author	SHA1	Message	Date
Armon Dadgar	87239044a5	Fix merge conflict	2014-06-17 12:50:35 -07:00
Phillip Markert	4db6d83f44	website: Fixed semantic meaning of upstream in DNS guide	2014-06-17 10:02:44 -04:00
Phillip Markert	5a345164c7	website: Fixing small typos in guides section	2014-06-17 09:55:00 -04:00
Armon Dadgar	3af3f40434	website: Documenting DNS settings	2014-06-08 17:26:41 -07:00