4 Commits (6cac440a8dffe6f42c2e32a919611bc1442cc611)

Author	SHA1	Message	Date
Armon Dadgar	46d07005a8	Fix merge conflict	2014-06-17 12:50:35 -07:00
Phillip Markert	ea1c3c4ea1	website: Fixed semantic meaning of upstream in DNS guide	2014-06-17 10:02:44 -04:00
Phillip Markert	339edd722b	website: Fixing small typos in guides section	2014-06-17 09:55:00 -04:00
Armon Dadgar	bd4610bcd1	website: Documenting DNS settings	2014-06-08 17:26:41 -07:00