From efc3be4bb183ba5fed773197c4a48b5a39a28228 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 8 Jun 2012 11:02:54 -0400
Subject: Move VLAN= docs to the interface configuration section, rather than
 /etc/sysconfig/network.

Conflicts:

	sysconfig.txt
---
 sysconfig.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysconfig.txt b/sysconfig.txt
index d682feff..01151a4e 100644
--- a/sysconfig.txt
+++ b/sysconfig.txt
@@ -185,7 +185,6 @@ Generic options:
   GATEWAY=<gateway IP>
   GATEWAYDEV=<gateway device to use, when multiple devices have GATEWAY=> (e.g. eth0)
   NISDOMAIN=<nis domain name>
-  VLAN=yes|no
   NOZEROCONF=
     Set this to not set a route for dynamic link-local addresses.
 
@@ -530,6 +529,7 @@ Files in /etc/sysconfig/network-scripts/
     HOTPLUG=yes|no
     USERCTL=yes|no
     BOOTPROTO=none|bootp|dhcp
+    VLAN=yes|no
     MTU=
       Default MTU for this device
     WINDOW=
-- 
cgit v1.2.1