From 31d1f288f5e5127466a1cac2ac9ea24fe5885b70 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 9 Jul 2013 13:10:06 -0400
Subject: [PATCH] server.conf: Remove dns=none example

This is covered in the manpage adequately, and we want this file to be
actual options now, not just commented out ones.
---
 data/server.conf.in | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/data/server.conf.in b/data/server.conf.in
index 757636389b..f96cec9f9d 100644
--- a/data/server.conf.in
+++ b/data/server.conf.in
@@ -39,15 +39,3 @@
 #ignore-carrier=eth0,ib0
 #ignore-carrier=aa:bb:cc:dd:ee:ff
 #ignore-carrier=*
-
-
-# Normally, NetworkManager adjusts /etc/resolv.conf to point to the
-# name servers associated with currently-active connections (either
-# manually-configured servers, or ones received via DHCP, etc).
-# Setting "dns=none" will turn off this behavior, and NetworkManager
-# will leave /etc/resolv.conf untouched. See NetworkManager.conf.5 for
-# more information about other values you can set this to.
-
-#dns=none
-
-